adjust grammar for recording receipt

- Ensure claims contain only correct and necessary giver and recipient identifiers, as per Endorser.ch documentation

.gitignore

@@ -55,4 +55,3 @@ build_logs/
 icons
 
 
-android/app/src/main/res/

BUILDING.md

@@ -321,11 +321,11 @@ Prerequisites: macOS with Xcode installed
 
 #### Each Release
 
-0. First time (or if dependencies change):
+0. First time (or if XCode dependencies change):
 
   - `pkgx +rubygems.org sh`
 
-  - ... and you may have to fix these, especially with pkgx:
+  - ... and you may have to fix these, especially with pkgx
 
    ```bash
    gem_path=$(which gem)
@@ -334,9 +334,12 @@ Prerequisites: macOS with Xcode installed
    export GEM_PATH=$shortened_path
    ```
 
-1. Check the iOS flag isIOS in CapacitorPlatformService (currently hard-coded for iOS build).
+   ```bash
+   cd ios/App
+   pod install
+   ```
 
-2. Build the web assets:
+1. Build the web assets:
 
    ```bash
    rm -rf dist
@@ -344,7 +347,8 @@ Prerequisites: macOS with Xcode installed
    npm run build:capacitor
    ```
 
-3. Update iOS project with latest build:
+
+2. Update iOS project with latest build:
 
    ```bash
    npx cap sync ios
@@ -352,7 +356,7 @@ Prerequisites: macOS with Xcode installed
 
   - If that fails with "Could not find..." then look at the "gem_path" instructions above.
 
-4. Copy the assets:
+3. Copy the assets:
 
    ```bash
    # It makes no sense why capacitor-assets will not run without these but it actually changes the contents.
@@ -363,14 +367,15 @@ Prerequisites: macOS with Xcode installed
    npx capacitor-assets generate --ios
    ```
 
-4. Bump the version to match Android & package.json:
+4. Bump the version to match Android:
 
    ```
    cd ios/App
-   xcrun agvtool new-version 30
+   xcrun agvtool new-version 25
    # Unfortunately this edits Info.plist directly.
    #xcrun agvtool new-marketing-version 0.4.5
-   cat App.xcodeproj/project.pbxproj | sed "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 0.5.4;/g" > temp && mv temp App.xcodeproj/project.pbxproj
+   cat App.xcodeproj/project.pbxproj | sed "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 0.5.1;/g" > temp
+   mv temp App.xcodeproj/project.pbxproj
    cd -
    ```
 
@@ -398,8 +403,6 @@ Prerequisites: macOS with Xcode installed
     * You'll probably have to "Manage" something about encryption, disallowed in France.
     * Then "Save" and "Add to Review" and "Resubmit to App Review".
 
-8. Revert the iOS flag isIOS in CapacitorPlatformService.
-
 ### Android Build
 
 Prerequisites: Android Studio with Java SDK installed
@@ -424,7 +427,7 @@ Prerequisites: Android Studio with Java SDK installed
    npx capacitor-assets generate --android
    ```
 
-4. Bump version to match iOS & package.json: android/app/build.gradle
+4. Bump version to match iOS: android/app/build.gradle
 
 5. Open the project in Android Studio:
 
@@ -475,7 +478,7 @@ At play.google.com/console:
 - Note that if you add testers, you have to go to "Publishing Overview" and send those changes or your (closed) testers won't see it.
 
 
-## Android Configuration for deep links
+## First-time Android Configuration for deep links
 
 You must add the following intent filter to the `android/app/src/main/AndroidManifest.xml` file:
 
@@ -486,6 +489,4 @@ You must add the following intent filter to the `android/app/src/main/AndroidMan
                   <category android:name="android.intent.category.BROWSABLE" />
                   <data android:scheme="timesafari" />
                </intent-filter>
-   ```
-
-... though when we tried that most recently it failed to 'build' the APK with: http(s) scheme and host attribute are missing, but are required for Android App Links [AppLinkUrlError]
+   ```

android/app/build.gradle

@@ -31,8 +31,8 @@ android {
         applicationId "app.timesafari.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 30
-        versionName "0.5.4"
+        versionCode 26
+        versionName "0.5.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

android/app/src/main/assets/capacitor.config.json

@@ -19,14 +19,14 @@
 		},
 		"SQLite": {
 			"iosDatabaseLocation": "Library/CapacitorDatabase",
-			"iosIsEncryption": false,
+			"iosIsEncryption": true,
 			"iosBiometric": {
-				"biometricAuth": false,
+				"biometricAuth": true,
 				"biometricTitle": "Biometric login for TimeSafari"
 			},
-			"androidIsEncryption": false,
+			"androidIsEncryption": true,
 			"androidBiometric": {
-				"biometricAuth": false,
+				"biometricAuth": true,
 				"biometricTitle": "Biometric login for TimeSafari"
 			}
 		}

capacitor.config.json

@@ -19,14 +19,14 @@
 		},
 		"SQLite": {
 			"iosDatabaseLocation": "Library/CapacitorDatabase",
-			"iosIsEncryption": false,
+			"iosIsEncryption": true,
 			"iosBiometric": {
-				"biometricAuth": false,
+				"biometricAuth": true,
 				"biometricTitle": "Biometric login for TimeSafari"
 			},
-			"androidIsEncryption": false,
+			"androidIsEncryption": true,
 			"androidBiometric": {
-				"biometricAuth": false,
+				"biometricAuth": true,
 				"biometricTitle": "Biometric login for TimeSafari"
 			}
 		}

docs/DATABASE_CONNECTION_FIXES.md

@@ -1,221 +0,0 @@
-# Database Connection Fixes for TimeSafari
-
-## Overview
-
-This document outlines the fixes implemented to resolve database connection issues in the TimeSafari application, particularly for Capacitor SQLite on Android devices.
-
-## Issues Identified
-
-### 1. CapacitorSQLitePlugin Errors
-- Multiple `*** ERROR CapacitorSQLitePlugin: null` messages in Android logs
-- Database connection conflicts and initialization failures
-- Connection leaks causing "Connection timesafari.sqlite already exists" errors
-
-### 2. Performance Issues
-- App skipping 57 frames due to main thread blocking
-- Null pointer exceptions in garbage collection
-- Memory management issues
-
-### 3. Connection Management
-- Lack of proper connection cleanup on app lifecycle events
-- No retry logic for failed connections
-- Missing error handling and recovery mechanisms
-
-## Implemented Fixes
-
-### 1. Enhanced Database Initialization
-
-#### Connection Cleanup
-- Added `cleanupExistingConnections()` method to properly close existing connections
-- Implemented connection consistency checks before creating new connections
-- Added proper error handling for connection cleanup failures
-
-#### Retry Logic
-- Implemented exponential backoff retry mechanism for database connections
-- Maximum of 3 retry attempts with increasing delays
-- Comprehensive error logging for each attempt
-
-#### Database Configuration
-- Configured optimal SQLite settings for performance and stability:
-  - `PRAGMA journal_mode=WAL` for better concurrency
-  - `PRAGMA synchronous=NORMAL` for balanced performance
-  - `PRAGMA cache_size=10000` for improved caching
-  - `PRAGMA temp_store=MEMORY` for faster temporary operations
-  - `PRAGMA mmap_size=268435456` (256MB) for memory mapping
-
-### 2. Lifecycle Management
-
-#### App Lifecycle Listeners
-- Added event listeners for `beforeunload` and `visibilitychange`
-- Automatic database cleanup when app goes to background
-- Proper resource management to prevent connection leaks
-
-#### Health Monitoring
-- Implemented `healthCheck()` method for connection status monitoring
-- Added `reinitializeDatabase()` for forced reconnection
-- Performance metrics tracking for database operations
-
-### 3. Error Handling and Diagnostics
-
-#### Comprehensive Error Handling
-- Enhanced error logging with detailed context
-- Graceful degradation when database operations fail
-- User-friendly error messages with recovery suggestions
-
-#### Diagnostic Tools
-- Created `databaseDiagnostics.ts` utility for troubleshooting
-- Database stress testing capabilities
-- Performance monitoring and reporting
-- System information collection for debugging
-
-### 4. Configuration Changes
-
-#### Capacitor Configuration
-- Temporarily disabled encryption to isolate connection issues
-- Disabled biometric authentication to reduce complexity
-- Maintained proper database location settings
-
-#### Camera Integration Fixes
-- Fixed `CameraDirection` enum usage for Capacitor Camera v6
-- Updated from string literals to proper enum values
-- Resolved TypeScript compilation errors
-
-## Usage
-
-### Running Diagnostics
-
-```typescript
-import { runDatabaseDiagnostics, stressTestDatabase } from '@/utils/databaseDiagnostics';
-
-// Run comprehensive diagnostics
-const diagnosticInfo = await runDatabaseDiagnostics();
-console.log('Database status:', diagnosticInfo.connectionStatus);
-
-// Run stress test
-await stressTestDatabase(20);
-```
-
-### Health Checks
-
-```typescript
-import { PlatformServiceFactory } from '@/services/PlatformServiceFactory';
-
-const platformService = PlatformServiceFactory.getInstance();
-const health = await platformService.healthCheck();
-
-if (!health.healthy) {
-  console.error('Database health check failed:', health.error);
-  // Attempt reinitialization
-  await platformService.reinitializeDatabase();
-}
-```
-
-### Performance Monitoring
-
-```typescript
-import { logDatabasePerformance } from '@/utils/databaseDiagnostics';
-
-// Wrap database operations with performance monitoring
-const start = Date.now();
-await platformService.dbQuery("SELECT * FROM users");
-const duration = Date.now() - start;
-logDatabasePerformance("User query", duration);
-```
-
-## Troubleshooting Guide
-
-### Common Issues and Solutions
-
-#### 1. "Connection timesafari.sqlite already exists"
-**Cause**: Multiple database connections not properly closed
-**Solution**: 
-- Use the enhanced cleanup methods
-- Check for existing connections before creating new ones
-- Implement proper app lifecycle management
-
-#### 2. CapacitorSQLitePlugin null errors
-**Cause**: Database initialization failures or connection conflicts
-**Solution**:
-- Use retry logic with exponential backoff
-- Check connection consistency
-- Verify database configuration settings
-
-#### 3. Performance Issues
-**Cause**: Main thread blocking or inefficient database operations
-**Solution**:
-- Use WAL journal mode for better concurrency
-- Implement proper connection pooling
-- Monitor and optimize query performance
-
-#### 4. Memory Leaks
-**Cause**: Database connections not properly closed
-**Solution**:
-- Implement proper cleanup on app lifecycle events
-- Use health checks to monitor connection status
-- Force reinitialization when issues are detected
-
-### Debugging Steps
-
-1. **Check Logs**: Look for database-related error messages
-2. **Run Diagnostics**: Use `runDatabaseDiagnostics()` to get system status
-3. **Monitor Performance**: Track query execution times
-4. **Test Connections**: Use stress testing to identify issues
-5. **Verify Configuration**: Check Capacitor and SQLite settings
-
-### Recovery Procedures
-
-#### Automatic Recovery
-- Health checks run periodically
-- Automatic reinitialization on connection failures
-- Graceful degradation for non-critical operations
-
-#### Manual Recovery
-- Force app restart to clear all connections
-- Clear app data if persistent issues occur
-- Check device storage and permissions
-
-## Security Considerations
-
-### Data Protection
-- Encryption can be re-enabled once connection issues are resolved
-- Biometric authentication can be restored after stability is confirmed
-- Proper error handling prevents data corruption
-
-### Privacy
-- Diagnostic information is logged locally only
-- No sensitive data is exposed in error messages
-- User data remains protected during recovery procedures
-
-## Performance Impact
-
-### Improvements
-- Reduced connection initialization time
-- Better memory usage through proper cleanup
-- Improved app responsiveness with background processing
-- Enhanced error recovery reduces user impact
-
-### Monitoring
-- Performance metrics are tracked automatically
-- Slow operations are logged with warnings
-- System resource usage is monitored
-
-## Future Enhancements
-
-### Planned Improvements
-1. **Connection Pooling**: Implement proper connection pooling for better performance
-2. **Encryption Re-enablement**: Restore encryption once stability is confirmed
-3. **Advanced Monitoring**: Add real-time performance dashboards
-4. **Automated Recovery**: Implement self-healing mechanisms
-
-### Research Areas
-1. **Alternative Storage**: Investigate other storage solutions for specific use cases
-2. **Migration Tools**: Develop tools for seamless data migration
-3. **Cross-Platform Optimization**: Optimize for different device capabilities
-
-## Conclusion
-
-These fixes address the core database connection issues while maintaining application stability and user experience. The enhanced error handling, monitoring, and recovery mechanisms provide a robust foundation for reliable database operations across all platforms.
-
-## Author
-
-Matthew Raymer - Database Architecture and Mobile Platform Development 

ios/App/App.xcodeproj/project.pbxproj

@@ -403,7 +403,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 30;
+				CURRENT_PROJECT_VERSION = 26;
 				DEVELOPMENT_TEAM = GM3FS5JQPH;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -413,7 +413,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.5.4;
+				MARKETING_VERSION = 0.5.1;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -430,7 +430,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 30;
+				CURRENT_PROJECT_VERSION = 26;
 				DEVELOPMENT_TEAM = GM3FS5JQPH;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -440,7 +440,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.5.4;
+				MARKETING_VERSION = 0.5.1;
 				PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "timesafari",
-  "version": "0.5.3",
+  "version": "0.4.8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "timesafari",
-      "version": "0.5.3",
+      "version": "0.4.8",
       "dependencies": {
         "@capacitor-community/sqlite": "6.0.2",
         "@capacitor-mlkit/barcode-scanning": "^6.0.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "timesafari",
-  "version": "0.5.4",
+  "version": "0.5.1",
   "description": "Time Safari Application",
   "author": {
     "name": "Time Safari Team"

src/components/GiftedDialog.vue

@@ -1,99 +1,477 @@
 <template>
   <div v-if="visible" class="dialog-overlay">
     <div class="dialog">
-      <h1 class="text-xl font-bold text-center mb-4">
-        {{ customTitle }}
-      </h1>
-      <input
-        v-model="description"
-        type="text"
-        class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
-        :placeholder="prompt || 'What was given?'"
-      />
-      <div class="flex flex-row justify-center">
-        <span
-          class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center text-blue-500 px-2 py-2 w-20"
-          @click="changeUnitCode()"
+      <!-- Step 1: Giver -->
+      <div v-show="currentStep === 1" id="sectionGiftedGiver">
+        <label class="block font-bold mb-4">
+          {{
+            stepType === "recipient"
+              ? "Choose who received the gift:"
+              : showProjects
+                ? "Choose a project benefitted from:"
+                : "Choose a person received from:"
+          }}
+        </label>
+
+        <!-- Unified Quick-pick grid for People and Projects -->
+        <ul
+          :class="
+            shouldShowProjects
+              ? 'grid grid-cols-3 md:grid-cols-4 gap-x-2 gap-y-4 text-center mb-4'
+              : 'grid grid-cols-4 sm:grid-cols-5 md:grid-cols-6 gap-x-2 gap-y-4 text-center mb-4'
+          "
         >
-          {{ libsUtil.UNIT_SHORT[unitCode] || unitCode }}
-        </span>
-        <div
-          class="border border-r-0 border-slate-400 bg-slate-200 px-4 py-2"
-          @click="amountInput === '0' ? null : decrement()"
-        >
-          <font-awesome icon="chevron-left" />
-        </div>
-        <input
-          id="inputGivenAmount"
-          v-model="amountInput"
-          type="number"
-          class="border border-r-0 border-slate-400 px-2 py-2 text-center w-20"
-        />
-        <div
-          class="rounded-r border border-slate-400 bg-slate-200 px-4 py-2"
-          @click="increment()"
-        >
-          <font-awesome icon="chevron-right" />
-        </div>
-      </div>
-      <div class="mt-4 flex justify-center">
-        <span>
-          <router-link
-            :to="{
-              name: 'gifted-details',
-              query: {
-                amountInput,
-                description,
-                giverDid: giver?.did,
-                giverName: giver?.name,
-                offerId,
-                fulfillsProjectId: toProjectId,
-                providerProjectId: fromProjectId,
-                recipientDid: receiver?.did,
-                recipientName: receiver?.name,
-                unitCode,
-              },
-            }"
-            class="text-blue-500"
-          >
-            Photo & more options ...
-          </router-link>
-        </span>
-      </div>
-      <p class="text-center mb-2 mt-6 italic">
-        Sign & Send to publish to the world
-        <font-awesome
-          icon="circle-info"
-          class="pl-2 text-blue-500 cursor-pointer"
-          @click="explainData()"
-        />
-      </p>
-      <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+          <template v-if="shouldShowProjects">
+            <!-- show projects -->
+            <li
+              v-for="project in projects.slice(0, 7)"
+              :key="project.handleId"
+              class="cursor-pointer"
+              @click="
+                stepType === 'recipient'
+                  ? selectRecipientProject(project)
+                  : selectProject(project)
+              "
+            >
+              <div class="relative w-fit mx-auto">
+                <ProjectIcon
+                  :entity-id="project.handleId"
+                  :icon-size="48"
+                  :image-url="project.image"
+                  class="!size-[3rem] mx-auto border border-slate-300 bg-white overflow-hidden rounded-full mb-1"
+                />
+              </div>
+              <h3
+                class="text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden"
+              >
+                {{ project.name }}
+              </h3>
+              <div class="text-xs text-slate-500 truncate">
+                <font-awesome icon="user" class="fa-fw text-slate-400" />
+                {{
+                  didInfo(project.issuerDid, activeDid, allMyDids, allContacts)
+                }}
+              </div>
+            </li>
+            <li
+              v-if="projects.length === 0"
+              class="text-xs text-slate-500 italic col-span-full"
+            >
+              (No projects found.)
+            </li>
+            <li v-if="projects.length > 0">
+              <router-link :to="{ name: 'discover' }" class="cursor-pointer">
+                <font-awesome
+                  icon="circle-right"
+                  class="text-blue-500 text-5xl mb-1"
+                />
+                <h3
+                  class="text-xs text-slate-500 font-medium italic text-ellipsis whitespace-nowrap overflow-hidden"
+                >
+                  Show All
+                </h3>
+              </router-link>
+            </li>
+          </template>
+          <template v-else>
+            <!-- show people (contacts) -->
+            <li
+              v-if="
+                stepType === 'recipient' ||
+                (stepType === 'giver' && isFromProjectView)
+              "
+              :class="{
+                'cursor-pointer': !wouldCreateConflict(activeDid),
+                'cursor-not-allowed opacity-50': wouldCreateConflict(activeDid)
+              }"
+              @click="
+                !wouldCreateConflict(activeDid) &&
+                (stepType === 'recipient'
+                  ? selectRecipient({ did: activeDid, name: 'You' })
+                  : selectGiver({ did: activeDid, name: 'You' }))
+              "
+            >
+              <font-awesome 
+                :class="{
+                  'text-blue-500 text-5xl mb-1': !wouldCreateConflict(activeDid),
+                  'text-slate-400 text-5xl mb-1': wouldCreateConflict(activeDid)
+                }" 
+                icon="hand" 
+              />
+              <h3
+                :class="{
+                  'text-xs text-blue-500 font-medium text-ellipsis whitespace-nowrap overflow-hidden': !wouldCreateConflict(activeDid),
+                  'text-xs text-slate-400 font-medium text-ellipsis whitespace-nowrap overflow-hidden': wouldCreateConflict(activeDid)
+                }"
+              >
+                You
+              </h3>
+            </li>
+            <li
+              class="cursor-pointer"
+              @click="
+                stepType === 'recipient' ? selectRecipient() : selectGiver()
+              "
+            >
+              <font-awesome
+                icon="circle-question"
+                class="text-slate-400 text-5xl mb-1"
+              />
+              <h3
+                class="text-xs text-slate-500 font-medium italic text-ellipsis whitespace-nowrap overflow-hidden"
+              >
+                Unnamed
+              </h3>
+            </li>
+            <li
+              v-if="allContacts.length === 0"
+              class="text-xs text-slate-500 italic col-span-full"
+            >
+              (Add friends to see more people worthy of recognition.)
+            </li>
+            <li
+              v-for="contact in allContacts.slice(0, 10)"
+              :key="contact.did"
+              :class="{
+                'cursor-pointer': !wouldCreateConflict(contact.did),
+                'cursor-not-allowed opacity-50': wouldCreateConflict(contact.did)
+              }"
+              @click="
+                !wouldCreateConflict(contact.did) &&
+                (stepType === 'recipient'
+                  ? selectRecipient(contact)
+                  : selectGiver(contact))
+              "
+            >
+              <div class="relative w-fit mx-auto">
+                <EntityIcon
+                  :contact="contact"
+                  class="!size-[3rem] mx-auto border border-slate-300 bg-white overflow-hidden rounded-full mb-1"
+                />
+                <div
+                  class="rounded-full bg-slate-400 absolute bottom-0 right-0 p-1 translate-x-1/3"
+                >
+                  <font-awesome
+                    icon="clock"
+                    class="block text-white text-xs w-[1em]"
+                  />
+                </div>
+              </div>
+              <h3
+                :class="{
+                  'text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden': !wouldCreateConflict(contact.did),
+                  'text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden text-slate-400': wouldCreateConflict(contact.did)
+                }"
+              >
+                {{ contact.name || contact.did }}
+              </h3>
+            </li>
+            <li v-if="allContacts.length > 0" class="cursor-pointer">
+              <router-link
+                :to="{
+                  name: 'contact-gift',
+                  query: {
+                    stepType: stepType,
+                    giverEntityType: giverEntityType,
+                    recipientEntityType: recipientEntityType,
+                    ...(stepType === 'giver'
+                      ? {
+                          recipientProjectId: toProjectId,
+                          recipientProjectName: receiver?.name,
+                          recipientProjectImage: receiver?.image,
+                          recipientProjectHandleId: receiver?.handleId,
+                          recipientDid: receiver?.did,
+                        }
+                      : {
+                          giverProjectId: fromProjectId,
+                          giverProjectName: giver?.name,
+                          giverProjectImage: giver?.image,
+                          giverProjectHandleId: giver?.handleId,
+                          giverDid: giver?.did,
+                        }),
+                    fromProjectId: fromProjectId,
+                    toProjectId: toProjectId,
+                    showProjects: (showProjects || false).toString(),
+                    isFromProjectView: (isFromProjectView || false).toString(),
+                  },
+                }"
+              >
+                <font-awesome
+                  icon="circle-right"
+                  class="text-blue-500 text-5xl mb-1"
+                />
+                <h3
+                  class="text-xs text-slate-500 font-medium italic text-ellipsis whitespace-nowrap overflow-hidden"
+                >
+                  Show All
+                </h3>
+              </router-link>
+            </li>
+          </template>
+        </ul>
+
         <button
-          class="block w-full text-center text-lg font-bold uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md"
-          @click="confirm"
-        >
-          Sign &amp; Send
-        </button>
-        <button
-          class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
+          class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-lg"
           @click="cancel"
         >
           Cancel
         </button>
       </div>
+
+      <!-- Step 2: Gift -->
+      <div v-show="currentStep === 2" id="sectionGiftedGift">
+        <div class="grid grid-cols-2 gap-2 mb-4">
+          <!-- Giver Button -->
+          <button
+            v-if="
+              (giverEntityType === 'person' || giverEntityType === 'project') &&
+              !(isFromProjectView && giverEntityType === 'project')
+            "
+            class="flex-1 flex items-center gap-2 bg-slate-100 border border-slate-300 rounded-md p-2"
+            @click="goBackToStep1('giver')"
+          >
+            <div>
+              <template v-if="giverEntityType === 'project'">
+                <ProjectIcon
+                  v-if="giver?.handleId"
+                  :entity-id="giver.handleId"
+                  :icon-size="32"
+                  :image-url="giver.image"
+                  class="rounded-full bg-white overflow-hidden !size-[2rem] object-cover"
+                />
+              </template>
+              <template v-else>
+                <EntityIcon
+                  v-if="giver?.did"
+                  :contact="giver"
+                  class="rounded-full bg-white overflow-hidden !size-[2rem] object-cover"
+                />
+                <font-awesome
+                  v-else
+                  icon="circle-question"
+                  class="text-slate-400 text-3xl"
+                />
+              </template>
+            </div>
+
+            <div class="text-start min-w-0">
+              <p class="text-xs text-slate-500 leading-1 -mb-1 uppercase">
+                {{
+                  giverEntityType === "project"
+                    ? "Benefited from:"
+                    : "Received from:"
+                }}
+              </p>
+              <h3 class="font-semibold truncate">
+                {{ giver?.name || "Unnamed" }}
+              </h3>
+            </div>
+
+            <p class="ms-auto text-sm text-blue-500 pe-1">
+              <font-awesome icon="pen" title="Change" />
+            </p>
+          </button>
+          <div
+            v-else
+            class="flex-1 flex items-center gap-2 bg-slate-100 border border-slate-300 rounded-md p-2"
+          >
+            <div>
+              <template v-if="giverEntityType === 'project'">
+                <ProjectIcon
+                  v-if="giver?.handleId"
+                  :entity-id="giver.handleId"
+                  :icon-size="32"
+                  :image-url="giver.image"
+                  class="rounded-full bg-white overflow-hidden !size-[2rem] object-cover"
+                />
+              </template>
+              <template v-else>
+                <EntityIcon
+                  v-if="giver?.did"
+                  :contact="giver"
+                  class="rounded-full bg-white overflow-hidden !size-[2rem] object-cover"
+                />
+                <font-awesome
+                  v-else
+                  icon="circle-question"
+                  class="text-slate-400 text-3xl"
+                />
+              </template>
+            </div>
+
+            <div class="text-start min-w-0">
+              <p class="text-xs text-slate-500 leading-1 -mb-1 uppercase">
+                {{
+                  giverEntityType === "project"
+                    ? "Benefited from:"
+                    : "Received from:"
+                }}
+              </p>
+              <h3 class="font-semibold truncate">
+                {{ giver?.name || "Unnamed" }}
+              </h3>
+            </div>
+
+            <p class="ms-auto text-sm text-slate-400 pe-1">
+              <font-awesome icon="lock" title="Can't be changed" />
+            </p>
+          </div>
+
+          <!-- Recipient Button -->
+          <button
+            v-if="recipientEntityType === 'person'"
+            class="flex-1 flex items-center gap-2 bg-slate-100 border border-slate-300 rounded-md p-2"
+            @click="goBackToStep1('recipient')"
+          >
+            <div>
+              <EntityIcon
+                v-if="receiver?.did"
+                :contact="receiver"
+                class="rounded-full bg-white overflow-hidden !size-[2rem] object-cover"
+              />
+              <font-awesome
+                v-else
+                icon="circle-question"
+                class="text-slate-400 text-3xl"
+              />
+            </div>
+
+            <div class="text-start min-w-0">
+              <p class="text-xs text-slate-500 leading-1 -mb-1 uppercase">
+                Given to:
+              </p>
+              <h3 class="font-semibold truncate">
+                {{ receiver?.name || "Unnamed" }}
+              </h3>
+            </div>
+
+            <p class="ms-auto text-sm text-blue-500 pe-1">
+              <font-awesome icon="pen" title="Change" />
+            </p>
+          </button>
+          <div
+            v-else-if="recipientEntityType === 'project'"
+            class="flex-1 flex items-center gap-2 bg-slate-100 border border-slate-300 rounded-md p-2"
+          >
+            <div>
+              <ProjectIcon
+                v-if="receiver?.handleId"
+                :entity-id="receiver.handleId"
+                :icon-size="32"
+                :image-url="receiver.image"
+                class="rounded-full bg-white overflow-hidden !size-[2rem] object-cover"
+              />
+            </div>
+
+            <div class="text-start min-w-0">
+              <p class="text-xs text-slate-500 leading-1 -mb-1 uppercase">
+                Given to project:
+              </p>
+              <h3 class="font-semibold truncate">
+                {{ receiver?.name || "Unnamed" }}
+              </h3>
+            </div>
+
+            <p class="ms-auto text-sm text-slate-400 pe-1">
+              <font-awesome icon="lock" title="Can't be changed" />
+            </p>
+          </div>
+        </div>
+        <input
+          v-model="description"
+          type="text"
+          class="block w-full rounded border border-slate-400 px-3 py-2 mb-4 placeholder:italic"
+          :placeholder="prompt || 'What was given?'"
+        />
+        <div class="flex mb-4">
+          <button
+            class="rounded-s border border-e-0 border-slate-400 bg-slate-200 px-4 py-2"
+            @click="amountInput === '0' ? null : decrement()"
+          >
+            <font-awesome icon="chevron-left" />
+          </button>
+          <input
+            id="inputGivenAmount"
+            v-model="amountInput"
+            type="number"
+            class="flex-1 border border-e-0 border-slate-400 px-2 py-2 text-center w-[1px]"
+          />
+          <button
+            class="rounded-e border border-slate-400 bg-slate-200 px-4 py-2"
+            @click="increment()"
+          >
+            <font-awesome icon="chevron-right" />
+          </button>
+
+          <select
+            v-model="unitCode"
+            class="flex-1 rounded border border-slate-400 ms-2 px-3 py-2"
+          >
+            <option value="HUR">Hours</option>
+            <option value="USD">US $</option>
+            <option value="BTC">BTC</option>
+            <option value="BX">BX</option>
+            <option value="ETH">ETH</option>
+          </select>
+        </div>
+        <router-link
+          :to="{
+            name: 'gifted-details',
+            query: giftedDetailsQuery,
+          }"
+          class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-lg mb-4"
+        >
+          Photo &amp; more options&hellip;
+        </router-link>
+        <p class="text-center text-sm mb-4">
+          <b class="font-medium">Sign &amp; Send</b> to publish to the world
+          <font-awesome
+            icon="circle-info"
+            class="fa-fw text-blue-500 text-base cursor-pointer"
+            @click="explainData()"
+          />
+        </p>
+        
+        <!-- Conflict warning -->
+        <div v-if="hasPersonConflict" class="mb-4 p-3 bg-red-50 border border-red-200 rounded-md">
+          <p class="text-red-700 text-sm text-center">
+            <font-awesome icon="exclamation-triangle" class="fa-fw mr-1" />
+            Cannot record: Same person selected as both giver and recipient
+          </p>
+        </div>
+        
+        <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+          <button
+            :disabled="hasPersonConflict"
+            :class="{
+              'block w-full text-center text-md uppercase font-bold bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-lg': !hasPersonConflict,
+              'block w-full text-center text-md uppercase font-bold bg-gradient-to-b from-slate-300 to-slate-500 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-slate-400 px-1.5 py-2 rounded-lg cursor-not-allowed': hasPersonConflict
+            }"
+            @click="confirm"
+          >
+            Sign &amp; Send
+          </button>
+          <button
+            class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-lg"
+            @click="cancel"
+          >
+            Cancel
+          </button>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <script lang="ts">
-import { Vue, Component, Prop } from "vue-facing-decorator";
+import { Vue, Component, Prop, Watch } from "vue-facing-decorator";
 
 import { NotificationIface, USE_DEXIE_DB } from "../constants/app";
 import {
   createAndSubmitGive,
   didInfo,
   serverMessageForUser,
+  getHeaders,
 } from "../libs/endorserServer";
 import * as libsUtil from "../libs/util";
 import { db, retrieveSettingsForActiveAccount } from "../db/index";
@@ -102,13 +480,38 @@ import * as databaseUtil from "../db/databaseUtil";
 import { retrieveAccountDids } from "../libs/util";
 import { logger } from "../utils/logger";
 import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
+import EntityIcon from "../components/EntityIcon.vue";
+import ProjectIcon from "../components/ProjectIcon.vue";
+import { PlanData } from "../interfaces/records";
 
-@Component
+@Component({
+  components: {
+    EntityIcon,
+    ProjectIcon,
+  },
+})
 export default class GiftedDialog extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   @Prop() fromProjectId = "";
   @Prop() toProjectId = "";
+  @Prop({ default: false }) showProjects = false;
+  @Prop() isFromProjectView = false;
+
+  @Watch("showProjects")
+  onShowProjectsChange() {
+    this.updateEntityTypes();
+  }
+
+  @Watch("fromProjectId")
+  onFromProjectIdChange() {
+    this.updateEntityTypes();
+  }
+
+  @Watch("toProjectId")
+  onToProjectIdChange() {
+    this.updateEntityTypes();
+  }
 
   activeDid = "";
   allContacts: Array<Contact> = [];
@@ -125,9 +528,84 @@ export default class GiftedDialog extends Vue {
   receiver?: libsUtil.GiverReceiverInputInfo;
   unitCode = "HUR";
   visible = false;
+  currentStep = 1;
 
   libsUtil = libsUtil;
 
+  projects: PlanData[] = [];
+
+  didInfo = didInfo;
+
+  // Computed property to help debug template logic
+  get shouldShowProjects() {
+    const result =
+      (this.stepType === "giver" && this.giverEntityType === "project") ||
+      (this.stepType === "recipient" && this.recipientEntityType === "project");
+    return result;
+  }
+
+  // Computed property to check if current selection would create a conflict
+  get hasPersonConflict() {
+    // Only check for conflicts when both entities are persons
+    if (this.giverEntityType !== "person" || this.recipientEntityType !== "person") {
+      return false;
+    }
+    
+    // Check if giver and recipient are the same person
+    if (this.giver?.did && this.receiver?.did && this.giver.did === this.receiver.did) {
+      return true;
+    }
+    
+    return false;
+  }
+
+  // Computed property to check if a contact would create a conflict when selected
+  wouldCreateConflict(contactDid: string) {
+    // Only check for conflicts when both entities are persons
+    if (this.giverEntityType !== "person" || this.recipientEntityType !== "person") {
+      return false;
+    }
+    
+    if (this.stepType === "giver") {
+      // If selecting as giver, check if it conflicts with current recipient
+      return this.receiver?.did === contactDid;
+    } else if (this.stepType === "recipient") {
+      // If selecting as recipient, check if it conflicts with current giver
+      return this.giver?.did === contactDid;
+    }
+    
+    return false;
+  }
+
+  stepType = "giver";
+  giverEntityType = "person" as "person" | "project";
+  recipientEntityType = "person" as "person" | "project";
+
+  updateEntityTypes() {
+    // Reset and set entity types based on current context
+    this.giverEntityType = "person";
+    this.recipientEntityType = "person";
+
+    // Determine entity types based on current context
+    if (this.showProjects) {
+      // HomeView "Project" button or ProjectViewView "Given by This"
+      this.giverEntityType = "project";
+      this.recipientEntityType = "person";
+    } else if (this.fromProjectId) {
+      // ProjectViewView "Given by This" button (project is giver)
+      this.giverEntityType = "project";
+      this.recipientEntityType = "person";
+    } else if (this.toProjectId) {
+      // ProjectViewView "Given to This" button (project is recipient)
+      this.giverEntityType = "person";
+      this.recipientEntityType = "project";
+    } else {
+      // HomeView "Person" button
+      this.giverEntityType = "person";
+      this.recipientEntityType = "person";
+    }
+  }
+
   async open(
     giver?: libsUtil.GiverReceiverInputInfo,
     receiver?: libsUtil.GiverReceiverInputInfo,
@@ -140,10 +618,14 @@ export default class GiftedDialog extends Vue {
     this.giver = giver;
     this.prompt = prompt || "";
     this.receiver = receiver;
-    // if we show "given to user" selection, default checkbox to true
     this.amountInput = "0";
     this.callbackOnSuccess = callbackOnSuccess;
     this.offerId = offerId || "";
+    this.currentStep = giver ? 2 : 1;
+    this.stepType = "giver";
+
+    // Update entity types based on current props
+    this.updateEntityTypes();
 
     try {
       let settings = await databaseUtil.retrieveSettingsForActiveAccount();
@@ -174,7 +656,16 @@ export default class GiftedDialog extends Vue {
           this.allContacts,
         );
       }
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
+      if (
+        this.giverEntityType === "project" ||
+        this.recipientEntityType === "project"
+      ) {
+        await this.loadProjects();
+      } else {
+        // Clear projects array when not needed
+        this.projects = [];
+      }
     } catch (err: any) {
       logger.error("Error retrieving settings from database:", err);
       this.$notify(
@@ -224,6 +715,7 @@ export default class GiftedDialog extends Vue {
     this.amountInput = "0";
     this.prompt = "";
     this.unitCode = "HUR";
+    this.currentStep = 1;
   }
 
   async confirm() {
@@ -265,6 +757,20 @@ export default class GiftedDialog extends Vue {
       );
       return;
     }
+    
+    // Check for person conflict
+    if (this.hasPersonConflict) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "You cannot select the same person as both giver and recipient.",
+        },
+        3000,
+      );
+      return;
+    }
 
     this.close();
     this.$notify(
@@ -304,24 +810,50 @@ export default class GiftedDialog extends Vue {
     unitCode: string = "HUR",
   ) {
     try {
+      // Determine the correct parameters based on entity types
+      let fromDid: string | undefined;
+      let toDid: string | undefined;
+      let fulfillsProjectHandleId: string | undefined;
+      let providerPlanHandleId: string | undefined;
+
+      if (this.giverEntityType === "project" && this.recipientEntityType === "person") {
+        // Project-to-person gift
+        fromDid = undefined; // No person giver
+        toDid = recipientDid as string; // Person recipient
+        fulfillsProjectHandleId = undefined; // No project recipient
+        providerPlanHandleId = this.giver?.handleId; // Project giver
+      } else if (this.giverEntityType === "person" && this.recipientEntityType === "project") {
+        // Person-to-project gift
+        fromDid = giverDid as string; // Person giver
+        toDid = undefined; // No person recipient
+        fulfillsProjectHandleId = this.toProjectId; // Project recipient
+        providerPlanHandleId = undefined; // No project giver
+      } else {
+        // Person-to-person gift
+        fromDid = giverDid as string;
+        toDid = recipientDid as string;
+        fulfillsProjectHandleId = undefined;
+        providerPlanHandleId = undefined;
+      }
+
       const result = await createAndSubmitGive(
         this.axios,
         this.apiServer,
         this.activeDid,
-        giverDid as string,
-        recipientDid as string,
+        fromDid,
+        toDid,
         description,
         amount,
         unitCode,
-        this.toProjectId,
+        fulfillsProjectHandleId,
         this.offerId,
         false,
         undefined,
-        this.fromProjectId,
+        providerPlanHandleId,
       );
 
       if (!result.success) {
-        const errorMessage = result.error;
+        const errorMessage = this.getGiveCreationErrorMessage(result);
         logger.error("Error with give creation result:", result);
         this.$notify(
           {
@@ -367,6 +899,19 @@ export default class GiftedDialog extends Vue {
 
   // Helper functions for readability
 
+  /**
+   * @param result direct response eg. ErrorResult or SuccessResult (potentially with embedded "data")
+   * @returns best guess at an error message
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  getGiveCreationErrorMessage(result: any) {
+    return (
+      result.error?.userMessage ||
+      result.error?.error ||
+      result.response?.data?.error?.message
+    );
+  }
+
   explainData() {
     this.$notify(
       {
@@ -378,6 +923,114 @@ export default class GiftedDialog extends Vue {
       -1,
     );
   }
+
+  selectGiver(contact?: Contact) {
+    if (contact) {
+      this.giver = {
+        did: contact.did,
+        name: contact.name || contact.did,
+      };
+    } else {
+      this.giver = {
+        did: "",
+        name: "Unnamed",
+      };
+    }
+    this.currentStep = 2;
+  }
+
+  goBackToStep1(step: string) {
+    this.stepType = step;
+    this.currentStep = 1;
+  }
+
+  async loadProjects() {
+    try {
+      const response = await fetch(this.apiServer + "/api/v2/report/plans", {
+        method: "GET",
+        headers: await getHeaders(this.activeDid),
+      });
+
+      if (response.status !== 200) {
+        throw new Error("Failed to load projects");
+      }
+
+      const results = await response.json();
+      if (results.data) {
+        this.projects = results.data;
+      }
+    } catch (error) {
+      logger.error("Error loading projects:", error);
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "Failed to load projects",
+        },
+        3000,
+      );
+    }
+  }
+
+  selectProject(project: PlanData) {
+    this.giver = {
+      did: project.handleId,
+      name: project.name,
+      image: project.image,
+      handleId: project.handleId,
+    };
+    this.receiver = {
+      did: this.activeDid,
+      name: "You",
+    };
+    this.currentStep = 2;
+  }
+
+  selectRecipient(contact?: Contact) {
+    if (contact) {
+      this.receiver = {
+        did: contact.did,
+        name: contact.name || contact.did,
+      };
+    } else {
+      this.receiver = {
+        did: "",
+        name: "Unnamed",
+      };
+    }
+    this.currentStep = 2;
+  }
+
+  selectRecipientProject(project: PlanData) {
+    this.receiver = {
+      did: project.handleId,
+      name: project.name,
+      image: project.image,
+      handleId: project.handleId,
+    };
+    this.currentStep = 2;
+  }
+
+  // Computed property for the query parameters
+  get giftedDetailsQuery() {
+    return {
+      amountInput: this.amountInput,
+      description: this.description,
+      giverDid: this.giverEntityType === "person" ? this.giver?.did : undefined,
+      giverName: this.giver?.name,
+      offerId: this.offerId,
+      fulfillsProjectId: this.giverEntityType === "person" && this.recipientEntityType === "project"
+        ? this.toProjectId
+        : undefined,
+      providerProjectId: this.giverEntityType === "project" && this.recipientEntityType === "person"
+        ? this.giver?.handleId
+        : this.fromProjectId,
+      recipientDid: this.receiver?.did,
+      recipientName: this.receiver?.name,
+      unitCode: this.unitCode,
+    };
+  }
 }
 </script>
 

src/components/HiddenDidDialog.vue

@@ -48,15 +48,12 @@
                   <span>
                     {{ didInfo(visDid) }}
                     <span v-if="!serverUtil.isEmptyOrHiddenDid(visDid)">
-                      <router-link
-                        :to="{ path: '/did/' + encodeURIComponent(visDid) }"
-                        class="text-blue-500"
-                      >
+                      <a :href="`/did/${visDid}`" class="text-blue-500">
                         <font-awesome
                           icon="arrow-up-right-from-square"
                           class="fa-fw"
                         />
-                      </router-link>
+                      </a>
                     </span>
                   </span>
                 </div>

src/components/OfferDialog.vue

@@ -250,7 +250,7 @@ export default class OfferDialog extends Vue {
       );
 
       if (!result.success) {
-        const errorMessage = result.error;
+        const errorMessage = this.getOfferCreationErrorMessage(result);
         logger.error("Error with offer creation result:", result);
         this.$notify(
           {
@@ -290,6 +290,21 @@ export default class OfferDialog extends Vue {
       );
     }
   }
+
+  // Helper functions for readability
+
+  /**
+   * @param result direct response eg. ErrorResult or SuccessResult (potentially with embedded "data")
+   * @returns best guess at an error message
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  getOfferCreationErrorMessage(result: any) {
+    return (
+      serverMessageForUser(result) ||
+      result.error?.userMessage ||
+      result.error?.error
+    );
+  }
 }
 </script>
 

src/components/TopMessage.vue

@@ -38,14 +38,14 @@ export default class TopMessage extends Vue {
         settings.apiServer !== AppString.PROD_ENDORSER_API_SERVER
       ) {
         const didPrefix = settings.activeDid?.slice(11, 15);
-        this.message = "You're not using prod, user " + didPrefix;
+        this.message = "You're linked to a non-prod server, user " + didPrefix;
       } else if (
         settings.warnIfProdServer &&
         settings.apiServer === AppString.PROD_ENDORSER_API_SERVER
       ) {
         const didPrefix = settings.activeDid?.slice(11, 15);
         this.message =
-          "You are using prod, user " + didPrefix;
+          "You're linked to the production server, user " + didPrefix;
       }
     } catch (err: unknown) {
       this.$notify(

src/interfaces/claims-result.ts

@@ -1,4 +1,6 @@
+import { AxiosResponse } from "axios";
 import { GiverReceiverInputInfo } from "../libs/util";
+import { ErrorResult, ResultWithType } from "./common";
 
 export interface GiverOutputInfo {
   action: string;
@@ -45,3 +47,12 @@ export interface ProviderInfo {
    */
   linkConfirmed: boolean;
 }
+
+// Type for createAndSubmitClaim result
+export type CreateAndSubmitClaimResult = SuccessResult | ErrorResult;
+
+// Update SuccessResult to use ClaimResult
+export interface SuccessResult extends ResultWithType {
+  type: "success";
+  response: AxiosResponse<ClaimResult>;
+}

src/interfaces/common.ts

@@ -15,6 +15,10 @@ export interface GenericCredWrapper<T extends GenericVerifiableCredential> {
   publicUrls?: Record<string, string>;
 }
 
+export interface ResultWithType {
+  type: string;
+}
+
 export interface ErrorResponse {
   error?: {
     message?: string;
@@ -26,6 +30,11 @@ export interface InternalError {
   userMessage?: string;
 }
 
+export interface ErrorResult extends ResultWithType {
+  type: "error";
+  error: InternalError;
+}
+
 export interface KeyMeta {
   did: string;
   publicKeyHex: string;

src/interfaces/index.ts

@@ -1,6 +1,5 @@
 export type {
   // From common.ts
-  CreateAndSubmitClaimResult,
   GenericCredWrapper,
   GenericVerifiableCredential,
   KeyMeta,
@@ -19,6 +18,11 @@ export type {
   RegisterActionClaim,
 } from "./claims";
 
+export type {
+  // From claims-result.ts
+  CreateAndSubmitClaimResult,
+} from "./claims-result";
+
 export type {
   // From records.ts
   PlanSummaryRecord,

src/libs/endorserServer.ts

@@ -979,7 +979,7 @@ export const createAndSubmitConfirmation = async (
   handleId: string | undefined,
   apiServer: string,
   axios: Axios,
-): Promise<CreateAndSubmitClaimResult> => {
+) => {
   const goodClaim = removeSchemaContext(
     removeVisibleToDids(
       addLastClaimOrHandleAsIdIfMissing(claim, lastClaimId, handleId),

src/libs/fontawesome.ts

@@ -29,6 +29,7 @@ import {
   faCircleCheck,
   faCircleInfo,
   faCircleQuestion,
+  faCircleRight,
   faCircleUser,
   faClock,
   faCoins,
@@ -60,6 +61,7 @@ import {
   faLightbulb,
   faLink,
   faLocationDot,
+  faLock,
   faLongArrowAltLeft,
   faLongArrowAltRight,
   faMagnifyingGlass,
@@ -79,6 +81,7 @@ import {
   faSquareCaretDown,
   faSquareCaretUp,
   faSquarePlus,
+  faThumbtack,
   faTrashCan,
   faTriangleExclamation,
   faUser,
@@ -111,6 +114,7 @@ library.add(
   faCircleCheck,
   faCircleInfo,
   faCircleQuestion,
+  faCircleRight,
   faCircleUser,
   faClock,
   faCoins,
@@ -142,6 +146,7 @@ library.add(
   faLightbulb,
   faLink,
   faLocationDot,
+  faLock,
   faLongArrowAltLeft,
   faLongArrowAltRight,
   faMagnifyingGlass,
@@ -161,6 +166,7 @@ library.add(
   faSquareCaretDown,
   faSquareCaretUp,
   faSquarePlus,
+  faThumbtack,
   faTrashCan,
   faTriangleExclamation,
   faUser,

src/libs/util.ts

@@ -49,6 +49,8 @@ import { insertDidSpecificSettings, parseJsonField } from "../db/databaseUtil";
 export interface GiverReceiverInputInfo {
   did?: string;
   name?: string;
+  image?: string;
+  handleId?: string;
 }
 
 export enum OnboardPage {

src/services/deepLinks.ts

@@ -81,16 +81,18 @@ export class DeepLinkHandler {
     string,
     { name: string; paramKey?: string }
   > = {
-    "claim": { name: "claim" },
-    "claim-add-raw": { name: "claim-add-raw" },
-    "claim-cert": { name: "claim-cert" },
-    "confirm-gift": { name: "confirm-gift" },
-    "did": { name: "did", paramKey: "did" },
-    "invite-one-accept": { name: "invite-one-accept" },
-    "onboard-meeting-members": { name: "onboard-meeting-members" },
-    "onboard-meeting-setup": { name: "onboard-meeting-setup" },
-    "project": { name: "project" },
     "user-profile": { name: "user-profile" },
+    "project-details": { name: "project-details" },
+    "onboard-meeting-setup": { name: "onboard-meeting-setup" },
+    "invite-one-accept": { name: "invite-one-accept" },
+    "contact-import": { name: "contact-import" },
+    "confirm-gift": { name: "confirm-gift" },
+    claim: { name: "claim" },
+    "claim-cert": { name: "claim-cert" },
+    "claim-add-raw": { name: "claim-add-raw" },
+    "contact-edit": { name: "contact-edit", paramKey: "did" },
+    contacts: { name: "contacts" },
+    did: { name: "did", paramKey: "did" },
   };
 
   /**

src/services/platforms/CapacitorPlatformService.ts

@@ -5,7 +5,6 @@ import {
   CameraSource,
   CameraDirection,
 } from "@capacitor/camera";
-import { Capacitor } from "@capacitor/core";
 import { Share } from "@capacitor/share";
 import {
   SQLiteConnection,
@@ -42,7 +41,7 @@ interface QueuedOperation {
  */
 export class CapacitorPlatformService implements PlatformService {
   /** Current camera direction */
-  private currentDirection: CameraDirection = CameraDirection.Rear;
+  private currentDirection: CameraDirection = "BACK";
 
   private sqlite: SQLiteConnection;
   private db: SQLiteDBConnection | null = null;
@@ -54,29 +53,6 @@ export class CapacitorPlatformService implements PlatformService {
 
   constructor() {
     this.sqlite = new SQLiteConnection(CapacitorSQLite);
-    
-    // Set up app lifecycle listeners for proper cleanup
-    this.setupLifecycleListeners();
-  }
-
-  /**
-   * Set up app lifecycle listeners for proper database cleanup
-   */
-  private setupLifecycleListeners(): void {
-    if (typeof window !== 'undefined' && window.addEventListener) {
-      // Handle app pause/resume events
-      window.addEventListener('beforeunload', () => {
-        this.cleanupDatabase();
-      });
-
-      // Handle visibility change (app going to background)
-      document.addEventListener('visibilitychange', () => {
-        if (document.hidden) {
-          // App going to background - ensure database is properly closed
-          this.cleanupDatabase();
-        }
-      });
-    }
   }
 
   private async initializeDatabase(): Promise<void> {
@@ -110,14 +86,19 @@ export class CapacitorPlatformService implements PlatformService {
     }
 
     try {
-      // Check if database connection already exists and close it
-      await this.cleanupExistingConnections();
+      // Create/Open database
+      this.db = await this.sqlite.createConnection(
+        this.dbName,
+        false,
+        "no-encryption",
+        1,
+        false,
+      );
 
-      // Create/Open database with retry logic
-      this.db = await this.createDatabaseConnection();
+      await this.db.open();
 
-      // Configure database for better performance and stability
-      await this.configureDatabase();
+      // Set journal mode to WAL for better performance
+      // await this.db.execute("PRAGMA journal_mode=WAL;");
 
       // Run migrations
       await this.runCapacitorMigrations();
@@ -134,8 +115,6 @@ export class CapacitorPlatformService implements PlatformService {
         "[CapacitorPlatformService] Error initializing SQLite database:",
         error,
       );
-      // Clean up on failure
-      await this.cleanupDatabase();
       throw new Error(
         "[CapacitorPlatformService] Failed to initialize database",
       );
@@ -268,7 +247,7 @@ export class CapacitorPlatformService implements PlatformService {
       hasFileSystem: true,
       hasCamera: true,
       isMobile: true,
-      isIOS: Capacitor.getPlatform() === "ios",
+      isIOS: /iPad|iPhone|iPod/.test(navigator.userAgent),
       hasFileDownload: false,
       needsFileHandlingInstructions: true,
       isNativeApp: true,
@@ -722,7 +701,7 @@ export class CapacitorPlatformService implements PlatformService {
    * @returns Promise that resolves when the camera is rotated
    */
   async rotateCamera(): Promise<void> {
-    this.currentDirection = this.currentDirection === CameraDirection.Rear ? CameraDirection.Front : CameraDirection.Rear;
+    this.currentDirection = this.currentDirection === "BACK" ? "FRONT" : "BACK";
     logger.debug(`Camera rotated to ${this.currentDirection} camera`);
   }
 
@@ -759,179 +738,4 @@ export class CapacitorPlatformService implements PlatformService {
       params || [],
     );
   }
-
-  /**
-   * Clean up any existing database connections to prevent conflicts
-   */
-  private async cleanupExistingConnections(): Promise<void> {
-    try {
-      // Check if we have an existing connection
-      if (this.db) {
-        try {
-          await this.db.close();
-        } catch (closeError) {
-          logger.warn(
-            "[CapacitorPlatformService] Error closing existing connection:",
-            closeError,
-          );
-        }
-        this.db = null;
-      }
-
-      // Check for existing connections with the same name
-      const connections = await this.sqlite.checkConnectionsConsistency();
-      const isConn = await this.sqlite.isConnection(this.dbName, false);
-      
-      if (isConn.result) {
-        logger.log(
-          "[CapacitorPlatformService] Found existing connection, closing it",
-        );
-        await this.sqlite.closeConnection(this.dbName, false);
-      }
-    } catch (error) {
-      logger.warn(
-        "[CapacitorPlatformService] Error during connection cleanup:",
-        error,
-      );
-    }
-  }
-
-  /**
-   * Create database connection with retry logic
-   */
-  private async createDatabaseConnection(): Promise<SQLiteDBConnection> {
-    const maxRetries = 3;
-    let lastError: Error | null = null;
-
-    for (let attempt = 1; attempt <= maxRetries; attempt++) {
-      try {
-        logger.log(
-          `[CapacitorPlatformService] Creating database connection (attempt ${attempt}/${maxRetries})`,
-        );
-
-        const db = await this.sqlite.createConnection(
-          this.dbName,
-          false,
-          "no-encryption",
-          1,
-          false,
-        );
-
-        await db.open();
-        
-        logger.log(
-          `[CapacitorPlatformService] Database connection created successfully on attempt ${attempt}`,
-        );
-        
-        return db;
-      } catch (error) {
-        lastError = error as Error;
-        logger.error(
-          `[CapacitorPlatformService] Database connection attempt ${attempt} failed:`,
-          error,
-        );
-
-        if (attempt < maxRetries) {
-          // Wait before retry with exponential backoff
-          const delay = Math.min(1000 * Math.pow(2, attempt - 1), 5000);
-          logger.log(
-            `[CapacitorPlatformService] Waiting ${delay}ms before retry...`,
-          );
-          await new Promise(resolve => setTimeout(resolve, delay));
-        }
-      }
-    }
-
-    throw new Error(
-      `[CapacitorPlatformService] Failed to create database connection after ${maxRetries} attempts: ${lastError?.message}`,
-    );
-  }
-
-  /**
-   * Configure database settings for optimal performance and stability
-   */
-  private async configureDatabase(): Promise<void> {
-    if (!this.db) {
-      throw new Error("Database not initialized");
-    }
-
-    try {
-      // Configure for better performance and stability
-      await this.db.execute("PRAGMA journal_mode=WAL;");
-      await this.db.execute("PRAGMA synchronous=NORMAL;");
-      await this.db.execute("PRAGMA cache_size=10000;");
-      await this.db.execute("PRAGMA temp_store=MEMORY;");
-      await this.db.execute("PRAGMA mmap_size=268435456;"); // 256MB
-      
-      logger.log(
-        "[CapacitorPlatformService] Database configuration applied successfully",
-      );
-    } catch (error) {
-      logger.warn(
-        "[CapacitorPlatformService] Error applying database configuration:",
-        error,
-      );
-      // Don't throw here as the database is still functional
-    }
-  }
-
-  /**
-   * Clean up database resources
-   */
-  private async cleanupDatabase(): Promise<void> {
-    try {
-      if (this.db) {
-        await this.db.close();
-        this.db = null;
-      }
-      this.initialized = false;
-      this.initializationPromise = null;
-      logger.log(
-        "[CapacitorPlatformService] Database cleanup completed",
-      );
-    } catch (error) {
-      logger.error(
-        "[CapacitorPlatformService] Error during database cleanup:",
-        error,
-      );
-    }
-  }
-
-  /**
-   * Health check for database connection
-   */
-  async healthCheck(): Promise<{ healthy: boolean; error?: string }> {
-    try {
-      if (!this.initialized || !this.db) {
-        return { healthy: false, error: "Database not initialized" };
-      }
-
-      // Try a simple query to test the connection
-      await this.db.query("SELECT 1 as test");
-      return { healthy: true };
-    } catch (error) {
-      logger.error("[CapacitorPlatformService] Health check failed:", error);
-      return { 
-        healthy: false, 
-        error: error instanceof Error ? error.message : String(error) 
-      };
-    }
-  }
-
-  /**
-   * Force reinitialize the database connection
-   */
-  async reinitializeDatabase(): Promise<void> {
-    logger.log("[CapacitorPlatformService] Forcing database reinitialization");
-    
-    // Clean up existing connection
-    await this.cleanupDatabase();
-    
-    // Reset initialization state
-    this.initialized = false;
-    this.initializationPromise = null;
-    
-    // Reinitialize
-    await this.initializeDatabase();
-  }
 }

src/utils/databaseDiagnostics.ts

@@ -1,158 +0,0 @@
-/**
- * Database Diagnostics Utility
- * 
- * This utility provides diagnostic tools for troubleshooting database connection
- * issues in the TimeSafari application, particularly for Capacitor SQLite.
- * 
- * @author Matthew Raymer
- */
-
-import { logger } from "./logger";
-import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
-
-export interface DatabaseDiagnosticInfo {
-  platform: string;
-  timestamp: string;
-  databaseName: string;
-  connectionStatus: string;
-  errorDetails?: string;
-  performanceMetrics?: {
-    initializationTime?: number;
-    queryTime?: number;
-  };
-  systemInfo?: {
-    userAgent: string;
-    platform: string;
-    memory?: {
-      used: number;
-      total: number;
-    };
-  };
-}
-
-/**
- * Performs comprehensive database diagnostics
- */
-export async function runDatabaseDiagnostics(): Promise<DatabaseDiagnosticInfo> {
-  const startTime = Date.now();
-  const diagnosticInfo: DatabaseDiagnosticInfo = {
-    platform: "unknown",
-    timestamp: new Date().toISOString(),
-    databaseName: "timesafari.sqlite",
-    connectionStatus: "unknown",
-  };
-
-  try {
-    // Get platform service
-    const platformService = PlatformServiceFactory.getInstance();
-    const capabilities = platformService.getCapabilities();
-    
-    diagnosticInfo.platform = capabilities.isIOS ? "iOS" : 
-                             capabilities.isMobile ? "Android" : "Web";
-
-    // Add system information
-    diagnosticInfo.systemInfo = {
-      userAgent: navigator.userAgent,
-      platform: navigator.platform,
-    };
-
-    // Add memory information if available
-    if ('memory' in performance) {
-      const memory = (performance as any).memory;
-      diagnosticInfo.systemInfo.memory = {
-        used: memory.usedJSHeapSize,
-        total: memory.totalJSHeapSize,
-      };
-    }
-
-    // Test database connection
-    const initStart = Date.now();
-    
-    try {
-      // Test a simple query
-      const queryStart = Date.now();
-      const result = await platformService.dbQuery("SELECT 1 as test");
-      const queryTime = Date.now() - queryStart;
-      
-      diagnosticInfo.connectionStatus = "healthy";
-      diagnosticInfo.performanceMetrics = {
-        queryTime,
-      };
-      
-      logger.log("[DatabaseDiagnostics] Database connection test successful");
-    } catch (error) {
-      diagnosticInfo.connectionStatus = "error";
-      diagnosticInfo.errorDetails = error instanceof Error ? error.message : String(error);
-      
-      logger.error("[DatabaseDiagnostics] Database connection test failed:", error);
-    }
-
-    const totalTime = Date.now() - startTime;
-    if (diagnosticInfo.performanceMetrics) {
-      diagnosticInfo.performanceMetrics.initializationTime = totalTime;
-    }
-
-  } catch (error) {
-    diagnosticInfo.connectionStatus = "critical";
-    diagnosticInfo.errorDetails = error instanceof Error ? error.message : String(error);
-    logger.error("[DatabaseDiagnostics] Diagnostic run failed:", error);
-  }
-
-  // Log the complete diagnostic information
-  logger.log("[DatabaseDiagnostics] Diagnostic results:", diagnosticInfo);
-  
-  return diagnosticInfo;
-}
-
-/**
- * Logs database performance metrics
- */
-export function logDatabasePerformance(operation: string, duration: number): void {
-  logger.log(`[DatabasePerformance] ${operation}: ${duration}ms`);
-  
-  // Log warning for slow operations
-  if (duration > 1000) {
-    logger.warn(`[DatabasePerformance] Slow operation detected: ${operation} took ${duration}ms`);
-  }
-}
-
-/**
- * Creates a database connection stress test
- */
-export async function stressTestDatabase(iterations: number = 10): Promise<void> {
-  logger.log(`[DatabaseStressTest] Starting stress test with ${iterations} iterations`);
-  
-  const platformService = PlatformServiceFactory.getInstance();
-  const results: number[] = [];
-  
-  for (let i = 0; i < iterations; i++) {
-    const start = Date.now();
-    try {
-      await platformService.dbQuery("SELECT 1 as test");
-      const duration = Date.now() - start;
-      results.push(duration);
-      
-      logger.log(`[DatabaseStressTest] Iteration ${i + 1}: ${duration}ms`);
-    } catch (error) {
-      logger.error(`[DatabaseStressTest] Iteration ${i + 1} failed:`, error);
-    }
-    
-    // Small delay between iterations
-    await new Promise(resolve => setTimeout(resolve, 100));
-  }
-  
-  if (results.length > 0) {
-    const avg = results.reduce((a, b) => a + b, 0) / results.length;
-    const min = Math.min(...results);
-    const max = Math.max(...results);
-    
-    logger.log(`[DatabaseStressTest] Results - Avg: ${avg.toFixed(2)}ms, Min: ${min}ms, Max: ${max}ms`);
-  }
-}
-
-/**
- * Exports diagnostic information for debugging
- */
-export function exportDiagnosticInfo(info: DatabaseDiagnosticInfo): string {
-  return JSON.stringify(info, null, 2);
-} 

src/views/ClaimAddRawView.vue

@@ -198,7 +198,7 @@ export default class ClaimAddRawView extends Vue {
       this.apiServer,
       this.axios,
     );
-    if (result.success) {
+    if (result.type === "success") {
       this.$notify(
         {
           group: "alert",

src/views/ClaimView.vue

@@ -46,7 +46,6 @@
             </h2>
             <div class="flex justify-center w-full">
               <router-link
-                v-if="veriClaim.id"
                 :to="'/claim-cert/' + encodeURIComponent(veriClaim.id)"
                 class="text-blue-500 mt-2"
                 title="Printable Certificate"
@@ -293,17 +292,12 @@
                   <div class="text-sm">
                     {{ didInfo(confirmerId) }}
                     <span v-if="!serverUtil.isEmptyOrHiddenDid(confirmerId)">
-                      <router-link
-                        :to="{
-                          path: '/did/' + encodeURIComponent(confirmerId),
-                        }"
-                        class="text-blue-500"
-                      >
+                      <a :href="`/did/${confirmerId}`" class="text-blue-500">
                         <font-awesome
                           icon="arrow-up-right-from-square"
                           class="fa-fw"
                         />
-                      </router-link>
+                      </a>
                     </span>
                   </div>
                 </div>
@@ -335,17 +329,12 @@
                   <div class="text-sm">
                     {{ didInfo(confsVisibleTo) }}
                     <span v-if="!serverUtil.isEmptyOrHiddenDid(confsVisibleTo)">
-                      <router-link
-                        :to="{
-                          path: '/did/' + encodeURIComponent(confsVisibleTo),
-                        }"
-                        class="text-blue-500"
-                      >
+                      <a :href="`/did/${confsVisibleTo}`" class="text-blue-500">
                         <font-awesome
                           icon="arrow-up-right-from-square"
                           class="fa-fw"
                         />
-                      </router-link>
+                      </a>
                     </span>
                   </div>
                 </div>
@@ -454,17 +443,12 @@
                   <span>
                     {{ didInfo(visDid) }}
                     <span v-if="!serverUtil.isEmptyOrHiddenDid(visDid)">
-                      <router-link
-                        :to="{
-                          path: '/did/' + encodeURIComponent(visDid),
-                        }"
-                        class="text-blue-500"
-                      >
+                      <a :href="`/did/${visDid}`" class="text-blue-500">
                         <font-awesome
                           icon="arrow-up-right-from-square"
                           class="fa-fw"
                         />
-                      </router-link>
+                      </a>
                     </span>
                     <span v-if="veriClaim.publicUrls?.[visDid]"
                       >, found at&nbsp;<a
@@ -941,7 +925,7 @@ export default class ClaimView extends Vue {
       this.apiServer,
       this.axios,
     );
-    if (result.success) {
+    if (result.type === "success") {
       this.$notify(
         {
           group: "alert",

src/views/ConfirmGiftView.vue

@@ -407,14 +407,14 @@
           </a>
         </div>
         <div class="mt-2 ml-2">
-          <router-link
+          <a
             v-if="isRegistered"
             class="text-blue-500 cursor-pointer"
-            :to="urlForNewGive"
+            :href="urlForNewGive"
           >
             <font-awesome icon="file-lines" />
             Record a Give Similar to the Original
-          </router-link>
+          </a>
         </div>
       </div>
     </div>
@@ -831,7 +831,7 @@ export default class ConfirmGiftView extends Vue {
       this.apiServer,
       this.axios,
     );
-    if (result.success) {
+    if (result.type === "success") {
       this.$notify(
         {
           group: "alert",

src/views/ContactGiftingView.vue

@@ -11,7 +11,7 @@
           class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
           ><font-awesome icon="chevron-left" class="fa-fw"></font-awesome>
         </router-link>
-        Given by...
+        {{ stepType === "giver" ? "Given by..." : "Given to..." }}
       </h1>
     </div>
 
@@ -31,7 +31,7 @@
             <button
               type="button"
               class="block w-full text-center text-sm uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-3 py-1.5 rounded-md"
-              @click="openDialog()"
+              @click="openDialog('Unnamed')"
             >
               <font-awesome icon="gift" class="fa-fw"></font-awesome>
             </button>
@@ -65,7 +65,13 @@
       </li>
     </ul>
 
-    <GiftedDialog ref="customDialog" :to-project-id="projectId" />
+    <GiftedDialog
+      ref="customDialog"
+      :from-project-id="fromProjectId"
+      :to-project-id="toProjectId"
+      :show-projects="showProjects"
+      :is-from-project-view="isFromProjectView"
+    />
   </section>
 </template>
 
@@ -97,6 +103,24 @@ export default class ContactGiftingView extends Vue {
   description = "";
   projectId = "";
   prompt = "";
+  recipientProjectName = "";
+  recipientProjectImage = "";
+  recipientProjectHandleId = "";
+
+  // New context parameters
+  stepType = "giver";
+  giverEntityType = "person" as "person" | "project";
+  recipientEntityType = "person" as "person" | "project";
+  giverProjectId = "";
+  giverProjectName = "";
+  giverProjectImage = "";
+  giverProjectHandleId = "";
+  giverDid = "";
+  recipientDid = "";
+  fromProjectId = "";
+  toProjectId = "";
+  showProjects = false;
+  isFromProjectView = false;
 
   async created() {
     try {
@@ -124,9 +148,41 @@ export default class ContactGiftingView extends Vue {
         );
       }
 
-      this.projectId = (this.$route.query["projectId"] as string) || "";
+      this.projectId =
+        (this.$route.query["recipientProjectId"] as string) || "";
+      this.recipientProjectName =
+        (this.$route.query["recipientProjectName"] as string) || "";
+      this.recipientProjectImage =
+        (this.$route.query["recipientProjectImage"] as string) || "";
+      this.recipientProjectHandleId =
+        (this.$route.query["recipientProjectHandleId"] as string) || "";
       this.prompt = (this.$route.query["prompt"] as string) ?? this.prompt;
 
+      // Read new context parameters
+      this.stepType = (this.$route.query["stepType"] as string) || "giver";
+      this.giverEntityType =
+        (this.$route.query["giverEntityType"] as "person" | "project") ||
+        "person";
+      this.recipientEntityType =
+        (this.$route.query["recipientEntityType"] as "person" | "project") ||
+        "person";
+      this.giverProjectId =
+        (this.$route.query["giverProjectId"] as string) || "";
+      this.giverProjectName =
+        (this.$route.query["giverProjectName"] as string) || "";
+      this.giverProjectImage =
+        (this.$route.query["giverProjectImage"] as string) || "";
+      this.giverProjectHandleId =
+        (this.$route.query["giverProjectHandleId"] as string) || "";
+      this.giverDid = (this.$route.query["giverDid"] as string) || "";
+      this.recipientDid = (this.$route.query["recipientDid"] as string) || "";
+      this.fromProjectId = (this.$route.query["fromProjectId"] as string) || "";
+      this.toProjectId = (this.$route.query["toProjectId"] as string) || "";
+      this.showProjects =
+        (this.$route.query["showProjects"] as string) === "true";
+      this.isFromProjectView =
+        (this.$route.query["isFromProjectView"] as string) === "true";
+
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
       logger.error("Error retrieving settings & contacts:", err);
@@ -144,17 +200,108 @@ export default class ContactGiftingView extends Vue {
     }
   }
 
-  openDialog(giver?: GiverReceiverInputInfo) {
-    const recipient = this.projectId
-      ? undefined
-      : { did: this.activeDid, name: "you" };
-    (this.$refs.customDialog as GiftedDialog).open(
-      giver,
-      recipient,
-      undefined,
-      "Given by " + (giver?.name || "someone not named"),
-      this.prompt,
-    );
+  openDialog(contact?: GiverReceiverInputInfo | "Unnamed") {
+    if (contact === "Unnamed") {
+      // Special case: Pass undefined to trigger Step 1, but with "Unnamed" pre-selected
+      let recipient: GiverReceiverInputInfo;
+      let giver: GiverReceiverInputInfo | undefined;
+
+      if (this.stepType === "giver") {
+        // We're selecting a giver, so recipient is either a project or the current user
+        if (this.recipientEntityType === "project") {
+          recipient = {
+            did: this.recipientProjectHandleId,
+            name: this.recipientProjectName,
+            image: this.recipientProjectImage,
+            handleId: this.recipientProjectHandleId,
+          };
+        } else {
+          recipient = { did: this.activeDid, name: "You" };
+        }
+        giver = undefined; // Will be set to "Unnamed" in GiftedDialog
+      } else {
+        // We're selecting a recipient, so recipient is "Unnamed" and giver is preserved from context
+        recipient = { did: "", name: "Unnamed" };
+
+        // Preserve the existing giver from the context
+        if (this.giverEntityType === "project") {
+          giver = {
+            did: this.giverProjectHandleId,
+            name: this.giverProjectName,
+            image: this.giverProjectImage,
+            handleId: this.giverProjectHandleId,
+          };
+        } else if (this.giverDid) {
+          giver = {
+            did: this.giverDid,
+            name: this.giverProjectName || "Someone",
+          };
+        } else {
+          giver = { did: this.activeDid, name: "You" };
+        }
+      }
+
+      (this.$refs.customDialog as GiftedDialog).open(
+        giver,
+        recipient,
+        undefined,
+        this.stepType === "giver" ? "Given by Unnamed" : "Given to Unnamed",
+        this.prompt,
+      );
+      // Immediately select "Unnamed" and move to Step 2
+      (this.$refs.customDialog as GiftedDialog).selectGiver();
+    } else {
+      // Regular case: contact is a GiverReceiverInputInfo
+      let giver: GiverReceiverInputInfo;
+      let recipient: GiverReceiverInputInfo;
+
+      if (this.stepType === "giver") {
+        // We're selecting a giver, so the contact becomes the giver
+        giver = contact as GiverReceiverInputInfo; // Safe because we know contact is not "Unnamed" or undefined
+
+        // Recipient is either a project or the current user
+        if (this.recipientEntityType === "project") {
+          recipient = {
+            did: this.recipientProjectHandleId,
+            name: this.recipientProjectName,
+            image: this.recipientProjectImage,
+            handleId: this.recipientProjectHandleId,
+          };
+        } else {
+          recipient = { did: this.activeDid, name: "You" };
+        }
+      } else {
+        // We're selecting a recipient, so the contact becomes the recipient
+        recipient = contact as GiverReceiverInputInfo; // Safe because we know contact is not "Unnamed" or undefined
+
+        // Preserve the existing giver from the context
+        if (this.giverEntityType === "project") {
+          giver = {
+            did: this.giverProjectHandleId,
+            name: this.giverProjectName,
+            image: this.giverProjectImage,
+            handleId: this.giverProjectHandleId,
+          };
+        } else if (this.giverDid) {
+          giver = {
+            did: this.giverDid,
+            name: this.giverProjectName || "Someone",
+          };
+        } else {
+          giver = { did: this.activeDid, name: "You" };
+        }
+      }
+
+      (this.$refs.customDialog as GiftedDialog).open(
+        giver,
+        recipient,
+        undefined,
+        this.stepType === "giver"
+          ? "Given by " + (contact?.name || "someone not named")
+          : "Given to " + (contact?.name || "someone not named"),
+        this.prompt,
+      );
+    }
   }
 }
 </script>

src/views/DiscoverView.vue

@@ -788,7 +788,7 @@ export default class DiscoverView extends Vue {
     const route = {
       path: this.isProjectsActive
         ? "/project/" + encodeURIComponent(id)
-        : "/user-profile/" + encodeURIComponent(id),
+        : "/userProfile/" + encodeURIComponent(id),
     };
     this.$router.push(route);
   }

src/views/GiftedDetailsView.vue

@@ -826,7 +826,7 @@ export default class GiftedDetails extends Vue {
       }
 
       if (!result.success) {
-        const errorMessage = result.error;
+        const errorMessage = this.getGiveCreationErrorMessage(result);
         logger.error("Error with give creation result:", result);
         this.$notify(
           {
@@ -899,6 +899,19 @@ export default class GiftedDetails extends Vue {
 
   // Helper functions for readability
 
+  /**
+   * @param result direct response eg. ErrorResult or SuccessResult (potentially with embedded "data")
+   * @returns best guess at an error message
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  getGiveCreationErrorMessage(result: any) {
+    return (
+      result.error?.userMessage ||
+      result.error?.error ||
+      result.response?.data?.error?.message
+    );
+  }
+
   explainData() {
     this.$notify(
       {

src/views/HelpView.vue

@@ -24,11 +24,11 @@
     <!-- eslint-disable prettier/prettier max-len -->
     <div>
       <p>
-        This app focuses on raw gratitude, using it to build cool things together with your network.
+        This app focuses on gifts & gratitude, using them to build cool things together with your network.
       </p>
 
       <p class="ml-4">
-        If you'd like to see the page-by-page help again,
+        If you'd like to see the page-by-page help,
         <span
           class="text-blue-500 cursor-pointer"
           @click="unsetFinishedOnboarding()"
@@ -555,6 +555,9 @@
         initiative.
       </p>
 
+      <h2 class="text-xl font-semibold">What app version is this?</h2>
+      <p>{{ package.version }} ({{ commitHash }})</p>
+
       <h2 class="text-xl font-semibold">
         I have other questions or feedback, like getting a new profile or removing my data or requesting an improvement.
       </h2>
@@ -564,28 +567,6 @@
           >info@TimeSafari.app</a
         >
       </p>
-
-      <h2 class="text-xl font-semibold">What app version is this?</h2>
-      <p>{{ package.version }} ({{ commitHash }})</p>
-
-      <div v-if="Capacitor.isNativePlatform()">
-        <h2 class="text-xl font-semibold">
-          Do I have the latest version?
-        </h2>
-        <p v-if="Capacitor.getPlatform() === 'ios'">
-          <a href="https://apps.apple.com/us/app/time-safari/id6742664907" target="_blank" class="text-blue-500">
-            Check the App Store.
-          </a>
-        </p>
-        <p v-else-if="Capacitor.getPlatform() === 'android'">
-          <a href="https://timesafari.app/app.apk" target="_blank" class="text-blue-500">
-            Download the latest APK to see.
-          </a>
-        </p>
-        <p v-else>
-          Sorry, your platform of '{{ Capacitor.getPlatform() }}' is not recognized.
-        </p>
-      </div>
     </div>
     <!-- eslint enable -->
   </section>
@@ -622,7 +603,6 @@ export default class HelpView extends Vue {
   showVerifiable = false;
 
   APP_SERVER = APP_SERVER;
-  Capacitor = Capacitor;
 
   // Ideally, we put no functionality in here, especially in the setup,
   // because we never want this page to have a chance of throwing an error.

src/views/HomeView.vue

@@ -117,101 +117,73 @@ Raymer * @version 1.0.0 */
           </div>
 
           <div v-else id="sectionRecordSomethingGiven">
-            <!-- !isCreatingIdentifier && isRegistered -->
+            <!-- Record Quick-Action -->
+            <div class="mb-6">
+              <div class="flex gap-2 items-center mb-2">
+                <h2 class="text-xl font-bold">Record something given by:</h2>
+                <button
+                  class="block ms-auto text-center text-white bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-2 rounded-full"
+                  @click="openGiftedPrompts()"
+                >
+                  <font-awesome
+                    icon="lightbulb"
+                    class="block text-center w-[1em]"
+                  />
+                </button>
+              </div>
 
-            <!-- show the actions for recognizing a give -->
-            <div class="flex">
-              <h2 class="text-xl font-bold">What have you seen someone do?</h2>
-              <button
-                class="ml-2 block text-xs text-center bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1 rounded-md"
-                @click="openGiftedPrompts()"
-              >
-                <font-awesome icon="lightbulb" class="fa-fw" />
-              </button>
+              <div class="grid grid-cols-2 gap-2">
+                <button
+                  type="button"
+                  class="text-center text-base uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-3 py-2 rounded-lg"
+                  @click="openDialogPerson()"
+                >
+                  <font-awesome icon="user" />
+                  Person
+                </button>
+                <button
+                  type="button"
+                  class="text-center text-base uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-3 py-2 rounded-lg"
+                  @click="openProjectDialog()"
+                >
+                  <font-awesome icon="folder-open" />
+                  Project
+                </button>
+              </div>
             </div>
-
-            <ul
-              class="grid grid-cols-4 sm:grid-cols-5 md:grid-cols-6 gap-x-3 gap-y-5 text-center mt-4"
-            >
-              <li @click="openDialog()">
-                <img
-                  src="../assets/blank-square.svg"
-                  class="mx-auto border border-blue-500 rounded-md mb-1 cursor-pointer"
-                />
-                <h3
-                  class="text-xs text-blue-500 italic font-medium text-ellipsis whitespace-nowrap overflow-hidden cursor-pointer"
-                >
-                  Unnamed/Unknown
-                </h3>
-              </li>
-              <li v-if="allContacts.length === 0" class="text-sm">
-                (Add friends to see more people worthy of recognition.)
-              </li>
-              <li
-                v-for="contact in allContacts.slice(0, 6)"
-                :key="contact.did"
-                @click="openDialog(contact)"
-              >
-                <EntityIcon
-                  :contact="contact"
-                  :icon-size="64"
-                  class="mx-auto border border-blue-500 rounded-md mb-1 cursor-pointer"
-                />
-                <h3
-                  class="text-xs text-blue-500 font-medium text-ellipsis whitespace-nowrap overflow-hidden cursor-pointer"
-                >
-                  {{ contact.name || contact.did }}
-                </h3>
-              </li>
-              <li>
-                <router-link
-                  v-if="allContacts.length >= 6"
-                  :to="{ name: 'contact-gift' }"
-                  class="flex align-bottom text-xs text-blue-500 mt-12 cursor-pointer"
-                >
-                  ... or someone else...
-                </router-link>
-              </li>
-            </ul>
           </div>
         </div>
       </div>
     </div>
 
-    <GiftedDialog ref="customDialog" />
+    <GiftedDialog ref="customDialog" :show-projects="showProjectsDialog" />
     <GiftedPrompts ref="giftedPrompts" />
     <FeedFilters ref="feedFilters" />
 
-    <div class="relative">
-      <button
-        v-if="isRegistered"
-        class="absolute right-6 bottom-0 transform translate-y-1/2 text-center text-4xl leading-none bg-green-600 text-white w-14 py-2.5 rounded-full"
-        @click="openDialog()"
-      >
-        <font-awesome icon="plus" class="fa-fw" />
-      </button>
-    </div>
-
     <!-- Results List -->
     <div class="mt-4 mb-4">
-      <div class="flex items-center mb-4">
-        <h2 class="text-xl font-bold flex items-center gap-4">
-          Latest Activity
-          <button
-            v-if="resultsAreFiltered()"
-            class="bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] px-3 py-1.5 rounded-md text-xs text-white"
-            @click="openFeedFilters()"
-          >
-            <font-awesome icon="filter" class="fa-fw" />
-          </button>
-          <button
-            v-else
-            class="bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] px-3 py-1.5 rounded-md text-xs text-white"
-            @click="openFeedFilters()"
-          >
-            <font-awesome icon="filter" class="fa-fw" />
-          </button>
-        </h2>
+      <div class="flex gap-2 items-center mb-3">
+        <h2 class="text-xl font-bold">Latest Activity</h2>
+        <button
+          v-if="resultsAreFiltered()"
+          class="block ms-auto text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-2 rounded-full"
+          @click="openFeedFilters()"
+        >
+          <font-awesome
+            icon="filter"
+            class="block text-center w-[1em] translate-y-[0.05em]"
+          />
+        </button>
+        <button
+          v-else
+          class="block ms-auto text-center text-white bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-2 rounded-full"
+          @click="openFeedFilters()"
+        >
+          <font-awesome
+            icon="filter"
+            class="block text-center w-[1em] translate-y-[0.05em]"
+          />
+        </button>
       </div>
 
       <div
@@ -474,6 +446,7 @@ export default class HomeView extends Vue {
   selectedImageData: Blob | null = null;
   isImageViewerOpen = false;
   imageCache: Map<string, Blob | null> = new Map();
+  showProjectsDialog = false;
 
   /**
    * Initializes the component on mount
@@ -1637,17 +1610,33 @@ export default class HomeView extends Vue {
    * @param giver Optional contact info for giver
    * @param description Optional gift description
    */
-  openDialog(giver?: GiverReceiverInputInfo, description?: string) {
-    (this.$refs.customDialog as GiftedDialog).open(
-      giver,
-      {
-        did: this.activeDid,
-        name: "you",
-      } as GiverReceiverInputInfo,
-      undefined,
-      "Given by " + (giver?.name || "someone not named"),
-      description,
-    );
+  openDialog(giver?: GiverReceiverInputInfo | "Unnamed", description?: string) {
+    if (giver === "Unnamed") {
+      // Special case: Pass undefined to trigger Step 1, but with "Unnamed" pre-selected
+      (this.$refs.customDialog as GiftedDialog).open(
+        undefined,
+        {
+          did: this.activeDid,
+          name: "You",
+        } as GiverReceiverInputInfo,
+        undefined,
+        "Given by Unnamed",
+        description,
+      );
+      // Immediately select "Unnamed" and move to Step 2
+      (this.$refs.customDialog as GiftedDialog).selectGiver();
+    } else {
+      (this.$refs.customDialog as GiftedDialog).open(
+        giver,
+        {
+          did: this.activeDid,
+          name: "You",
+        } as GiverReceiverInputInfo,
+        undefined,
+        "Given by " + (giver?.name || "someone not named"),
+        description,
+      );
+    }
   }
 
   /**
@@ -1843,7 +1832,7 @@ export default class HomeView extends Vue {
             this.axios,
           );
 
-          if (result.success) {
+          if (result.type === "success") {
             this.$notify(
               {
                 group: "alert",
@@ -1881,5 +1870,18 @@ export default class HomeView extends Vue {
       this.$router.push({ name: "contact-qr" });
     }
   }
+
+  openDialogPerson(
+    giver?: GiverReceiverInputInfo | "Unnamed",
+    description?: string,
+  ) {
+    this.showProjectsDialog = false;
+    this.openDialog(giver, description);
+  }
+
+  openProjectDialog() {
+    this.showProjectsDialog = true;
+    (this.$refs.customDialog as any).open();
+  }
 }
 </script>

src/views/ProjectViewView.vue

@@ -52,24 +52,16 @@
                   icon="user"
                   class="fa-fw text-slate-400"
                 ></font-awesome>
-                <span class="truncate inline-block max-w-[calc(100%-2rem)]">
-                  {{ issuerInfoObject?.displayName }}
-                </span>
-                <span class="inline-flex items-center">
-                  <router-link
-                    :to="{
-                      path: '/did/' + encodeURIComponent(issuer),
-                    }"
-                    class="text-blue-500 ml-1"
-                    title="See more about this person"
-                  >
+                {{ issuerInfoObject?.displayName }}
+                <span v-if="!serverUtil.isEmptyOrHiddenDid(issuer)">
+                  <a :href="`/did/${issuer}`" class="text-blue-500">
                     <font-awesome
                       icon="arrow-up-right-from-square"
                       class="fa-fw"
                     />
-                  </router-link>
+                  </a>
                 </span>
-                <span v-if="serverUtil.isHiddenDid(issuer)" class="ml-1">
+                <span v-else-if="serverUtil.isHiddenDid(issuer)">
                   <font-awesome
                     icon="info-circle"
                     class="fa-fw text-blue-500 cursor-pointer"
@@ -204,63 +196,11 @@
       </div>
     </div>
 
-    <div v-if="activeDid && isRegistered">
-      <div class="text-center">
-        <p class="mt-2 mt-4 text-center">Record a contribution from:</p>
-      </div>
-      <ul
-        class="grid grid-cols-4 sm:grid-cols-5 md:grid-cols-6 gap-x-3 gap-y-5 text-center mb-5 mt-2"
-      >
-        <li @click="openGiftDialogToProject({ name: 'you', did: activeDid })">
-          <font-awesome
-            icon="hand"
-            class="fa-fw text-blue-500 text-5xl cursor-pointer"
-          />
-          <h3
-            class="mt-5 text-xs text-blue-500 font-medium text-ellipsis whitespace-nowrap overflow-hidden cursor-pointer"
-          >
-            You
-          </h3>
-        </li>
-        <li @click="openGiftDialogToProject()">
-          <img
-            src="../assets/blank-square.svg"
-            class="mx-auto border border-blue-300 rounded-md mb-1 cursor-pointer"
-          />
-          <h3
-            class="text-xs text-blue-500 italic font-medium text-ellipsis whitespace-nowrap overflow-hidden cursor-pointer"
-          >
-            Unnamed/Unknown
-          </h3>
-        </li>
-        <li
-          v-for="contact in allContacts.slice(0, 5)"
-          :key="contact.did"
-          @click="openGiftDialogToProject(contact)"
-        >
-          <EntityIcon
-            :contact="contact"
-            :icon-size="64"
-            class="mx-auto border border-blue-300 rounded-md mb-1 cursor-pointer"
-          />
-          <h3
-            class="text-xs text-blue-500 font-medium text-ellipsis whitespace-nowrap overflow-hidden cursor-pointer"
-          >
-            {{ contact.name || "(no name)" }}
-          </h3>
-        </li>
-        <li>
-          <span
-            v-if="allContacts.length >= 5"
-            class="flex align-bottom text-xs text-blue-500 mt-12 cursor-pointer"
-            @click="onClickAllContactsGifting()"
-          >
-            ... or someone else...
-          </span>
-        </li>
-      </ul>
-    </div>
-    <GiftedDialog ref="giveDialogToThis" :to-project-id="projectId" />
+    <GiftedDialog
+      ref="giveDialogToThis"
+      :to-project-id="projectId"
+      :is-from-project-view="true"
+    />
 
     <!-- Offers & Gifts to & from this -->
     <div class="grid items-start grid-cols-1 sm:grid-cols-3 gap-4 mt-4">
@@ -526,7 +466,12 @@
             </button>
           </div>
         </div>
-        <GiftedDialog ref="giveDialogFromThis" :from-project-id="projectId" />
+        <GiftedDialog
+          ref="giveDialogFromThis"
+          :from-project-id="projectId"
+          :show-projects="true"
+          :is-from-project-view="true"
+        />
 
         <h3 class="text-lg font-bold mb-3 mt-4">
           Benefitted From This Project
@@ -1237,21 +1182,53 @@ export default class ProjectViewView extends Vue {
     );
   }
 
-  openGiftDialogToProject(contact?: libsUtil.GiverReceiverInputInfo) {
-    (this.$refs.giveDialogToThis as GiftedDialog).open(
-      contact,
-      undefined,
-      undefined,
-      (contact?.name || "Someone not named") + ` gave to this project`,
-    );
+  openGiftDialogToProject(
+    contact?: libsUtil.GiverReceiverInputInfo | "Unnamed",
+  ) {
+    if (contact === "Unnamed") {
+      // Special case: Pass undefined to trigger Step 1, but with "Unnamed" pre-selected
+      (this.$refs.giveDialogToThis as GiftedDialog).open(
+        undefined,
+        undefined,
+        undefined,
+        "Given by Unnamed to this project",
+      );
+      // Immediately select "Unnamed" and move to Step 2
+      (this.$refs.giveDialogToThis as GiftedDialog).selectGiver();
+    } else {
+      // Open straight to Step 2 with current user as giver and current project as recipient
+      (this.$refs.giveDialogToThis as GiftedDialog).open(
+        {
+          did: this.activeDid,
+          name: "You",
+        },
+        {
+          did: this.issuer,
+          name: this.name,
+          handleId: this.projectId,
+          image: this.imageUrl,
+        },
+        undefined,
+        `Given to ${this.name}`,
+      );
+    }
   }
 
   openGiftDialogFromProject() {
+    // Set the project as giver and the current user as recipient
     (this.$refs.giveDialogFromThis as GiftedDialog).open(
-      undefined,
+      {
+        did: undefined,
+        name: this.name,
+        handleId: this.projectId,
+        image: this.imageUrl,
+      },
       { did: this.activeDid, name: "You" },
       undefined,
-      `This project gave to you`,
+      `${this.name} gave to you`,
+      undefined,
+      undefined,
+      true,
     );
   }
 
@@ -1433,7 +1410,7 @@ export default class ProjectViewView extends Vue {
       this.apiServer,
       this.axios,
     );
-    if (result.success) {
+    if (result.type === "success") {
       this.$notify(
         {
           group: "alert",

src/views/QuickActionBvcEndView.vue

@@ -155,7 +155,7 @@ import { Contact } from "../db/tables/contacts";
 import {
   GenericCredWrapper,
   GenericVerifiableCredential,
-  CreateAndSubmitClaimResult,
+  ErrorResult,
 } from "../interfaces";
 import {
   BVC_MEETUPS_PROJECT_CLAIM_ID,
@@ -298,13 +298,13 @@ export default class QuickActionBvcBeginView extends Vue {
       }
 
       // in parallel, make a confirmation for each selected claim and send them all to the server
-      const confirmResults: PromiseSettledResult<CreateAndSubmitClaimResult>[] = await Promise.allSettled(
+      const confirmResults = await Promise.allSettled(
         this.claimsToConfirmSelected.map(async (jwtId) => {
           const record = this.claimsToConfirm.find(
             (claim) => claim.id === jwtId,
           );
           if (!record) {
-            return { success: false, error: "Record not found." };
+            return { type: "error", error: "Record not found." };
           }
           return createAndSubmitConfirmation(
             this.activeDid,
@@ -318,8 +318,8 @@ export default class QuickActionBvcBeginView extends Vue {
       );
       // check for any rejected confirmations
       const confirmsSucceeded = confirmResults.filter(
-        // 'fulfilled' is the status in a successful PromiseFulfilledResult
-        (result) => result.status === "fulfilled" && result.value.success,
+        (result) =>
+          result.status === "fulfilled" && result.value.type === "success",
       );
       if (confirmsSucceeded.length < this.claimsToConfirmSelected.length) {
         logger.error("Error sending confirmations:", confirmResults);
@@ -353,7 +353,7 @@ export default class QuickActionBvcBeginView extends Vue {
           undefined,
           BVC_MEETUPS_PROJECT_CLAIM_ID,
         );
-        giveSucceeded = giveResult.success;
+        giveSucceeded = giveResult.type === "success";
         if (!giveSucceeded) {
           logger.error("Error sending give:", giveResult);
           this.$notify(
@@ -362,7 +362,7 @@ export default class QuickActionBvcBeginView extends Vue {
               type: "danger",
               title: "Error",
               text:
-                (giveResult as CreateAndSubmitClaimResult)?.error ||
+                (giveResult as ErrorResult)?.error?.userMessage ||
                 "There was an error sending that give.",
             },
             5000,