From a66093028e51a57f92dcd0986555a3ee0153a7d1 Mon Sep 17 00:00:00 2001
From: Matthew Raymer <matthew.raymer@anomalistdesign.com>
Date: Sun, 16 Feb 2025 03:29:22 +0000
Subject: [PATCH] docs(tests): Add comprehensive test suite documentation

- Add detailed header documentation to playwright tests
- Document test categories and flows
- Add key selector documentation
- Document state verification and alert handling
- Include code examples and usage patterns
- Add important checks and requirements

The documentation helps developers understand the foundational tests that verify
basic application functionality before running more complex test suites.
---
 test-playwright/00-noid-tests.spec.ts         |  70 +++
 test-playwright/05-invite.spec.ts             |  30 +
 test-playwright/10-check-usage-limits.spec.ts |  89 ++-
 test-playwright/20-create-project.spec.ts     |  61 +-
 test-playwright/25-create-project-x10.spec.ts |  85 ++-
 test-playwright/30-record-gift.spec.ts        |  80 +++
 test-playwright/33-record-gift-x10.spec.ts    |  86 +++
 .../35-record-gift-from-image-share.spec.ts   | 167 +++---
 test-playwright/40-add-contact.spec.ts        | 559 +++++-------------
 test-playwright/50-record-offer.spec.ts       |   2 +
 10 files changed, 698 insertions(+), 531 deletions(-)

diff --git a/test-playwright/00-noid-tests.spec.ts b/test-playwright/00-noid-tests.spec.ts
index 3631e874..644451db 100644
--- a/test-playwright/00-noid-tests.spec.ts
+++ b/test-playwright/00-noid-tests.spec.ts
@@ -1,3 +1,73 @@
+/**
+ * Initial State and Basic Functionality Tests
+ * 
+ * Core test suite that validates fundamental application features and initial state handling.
+ * These tests run first to ensure basic functionality before more complex tests.
+ * 
+ * Test Categories:
+ * 1. Activity Feed
+ *    - Verifies server connectivity
+ *    - Tests infinite scroll loading
+ *    - Checks initial 10 activities load
+ *    - Validates additional activity loading
+ * 
+ * 2. Discovery Features
+ *    - Tests project listing
+ *    - Verifies infinite scroll
+ *    - Checks project card rendering
+ * 
+ * 3. Account State
+ *    - Validates initial no-ID state
+ *    - Tests ID generation flow
+ *    - Verifies registration notices
+ *    - Checks account detail display
+ * 
+ * 4. Contact Sharing
+ *    - Tests name setting functionality
+ *    - Validates clipboard operations
+ *    - Checks sharing UI elements
+ *    - Verifies alert handling
+ * 
+ * 5. User Registration
+ *    - Tests User 0's ability to register others
+ *    - Validates gift recording after registration
+ *    - Checks contact deletion
+ *    - Verifies deleted contact handling
+ * 
+ * Key Selectors:
+ * - Activity list: 'ul#listLatestActivity li'
+ * - Discover list: 'ul#listDiscoverResults li'
+ * - Account notices: '#noticeBeforeShare', '#noticeBeforeAnnounce'
+ * - Identity details: '#sectionIdentityDetails code.truncate'
+ * 
+ * State Verification:
+ * - Checks empty ID state
+ * - Verifies ID generation
+ * - Validates alert presence/dismissal
+ * - Confirms navigation state
+ * 
+ * Alert Handling:
+ * - Closes onboarding dialogs
+ * - Verifies alert content
+ * - Checks alert dismissal
+ * - Validates alert transitions
+ * 
+ * Important Checks:
+ * - Server connectivity
+ * - Data loading
+ * - UI state transitions
+ * - Error conditions
+ * - Clipboard operations
+ * 
+ * @example Checking activity feed
+ * ```typescript
+ * await page.goto('./');
+ * await page.getByTestId('closeOnboardingAndFinish').click();
+ * await expect(page.locator('ul#listLatestActivity li:nth-child(10)'))
+ *   .toBeVisible();
+ * ```
+ */
+
 import { test, expect } from '@playwright/test';
 import { deleteContact, generateAndRegisterEthrUser, importUser } from './testUtils';
 
diff --git a/test-playwright/05-invite.spec.ts b/test-playwright/05-invite.spec.ts
index 114bffc3..821f7c39 100644
--- a/test-playwright/05-invite.spec.ts
+++ b/test-playwright/05-invite.spec.ts
@@ -1,3 +1,33 @@
+/**
+ * @file Invitation Flow Test
+ * @description Tests the end-to-end functionality of inviting a new user to TimeSafari
+ * 
+ * This test verifies:
+ * 1. User can create a new invitation with:
+ *    - Custom notes
+ *    - Custom expiration date
+ * 2. The invitation appears in the list after creation
+ * 3. A new user can accept the invitation and become connected
+ * 
+ * Test Flow:
+ * 1. Imports User 0 (test account)
+ * 2. Creates an invitation with:
+ *    - Random neighbor identifier
+ *    - 14 day expiration
+ *    - Custom notes
+ * 3. Verifies the invite appears in the list
+ * 4. Creates a new user with Ethr DID
+ * 5. Accepts the invitation as the new user
+ * 6. Verifies the connection is established
+ * 
+ * Related Files:
+ * - Frontend invite handling: src/libs/endorserServer.ts
+ * - JWT creation: sw_scripts/safari-notifications.js
+ * 
+ * @see Documentation on invitation flows in usage-guide.md
+ * @requires @playwright/test
+ * @requires ./testUtils - For user management utilities
+ */
 import { test, expect } from '@playwright/test';
 import { deleteContact, generateNewEthrUser, generateRandomString, importUser, switchToUser } from './testUtils';
 
diff --git a/test-playwright/10-check-usage-limits.spec.ts b/test-playwright/10-check-usage-limits.spec.ts
index 43e1bae1..d2805c3f 100644
--- a/test-playwright/10-check-usage-limits.spec.ts
+++ b/test-playwright/10-check-usage-limits.spec.ts
@@ -1,9 +1,67 @@
+/**
+ * End-to-End Contact Management Tests
+ * 
+ * Comprehensive test suite for Time Safari's contact management and gift recording features.
+ * Tests run sequentially to avoid state conflicts and API rate limits.
+ * 
+ * Test Flow:
+ * 1. Contact Creation & Verification
+ *    - Add contact using DID
+ *    - Verify contact appears in list
+ *    - Rename contact and verify change
+ *    - Check contact appears in "Record Something" section
+ * 
+ * 2. Gift Recording Flow
+ *    - Generate unique gift details
+ *    - Record gift to contact
+ *    - Verify gift confirmation
+ *    - Check gift appears in activity feed
+ * 
+ * 3. Contact Import/Export Tests
+ *    - Copy contact details to clipboard
+ *    - Delete existing contact
+ *    - Import contact from clipboard
+ *    - Verify imported contact details
+ * 
+ * Test Data Generation:
+ * - Gift titles: "Gift " + 16-char random string
+ * - Gift amounts: Random 1-99 value
+ * - Contact names: Predefined test values
+ * - DIDs: Uses test accounts (e.g., did:ethr:0x000...)
+ * 
+ * Key Selectors:
+ * - Contact list: 'li[data-testid="contactListItem"]'
+ * - Gift recording: '#sectionRecordSomethingGiven'
+ * - Contact name: '[data-testid="contactName"] input'
+ * - Alert dialogs: 'div[role="alert"]'
+ * 
+ * Timeouts & Retries:
+ * - Uses OS-specific timeouts (longer for Linux)
+ * - Implements retry logic for network operations
+ * - Waits for UI animations and state changes
+ * 
+ * Alert Handling:
+ * - Closes onboarding dialogs
+ * - Handles registration prompts
+ * - Verifies alert dismissal
+ * 
+ * State Requirements:
+ * - Clean database state
+ * - No existing contacts for test DIDs
+ * - Available API rate limits
+ * 
+ * @example Basic contact addition
+ * ```typescript
+ * await page.goto('./contacts');
+ * await page.getByPlaceholder('URL or DID, Name, Public Key')
+ *   .fill('did:ethr:0x000...., User Name');
+ * await page.locator('button > svg.fa-plus').click();
+ * ```
+ */
 import { test, expect } from '@playwright/test';
-import { importUser, isLinuxEnvironment, getOSSpecificTimeout } from './testUtils';
+import { importUser } from './testUtils';
 
 test('Check usage limits', async ({ page }) => {
-  const TIMEOUT = getOSSpecificTimeout();
-
   // Check without ID first
   await page.goto('./account');
   await expect(page.locator('div.bg-slate-100.rounded-md').filter({ hasText: 'Usage Limits' })).toBeHidden();
@@ -11,27 +69,20 @@ test('Check usage limits', async ({ page }) => {
   // Import user 01
   const did = await importUser(page, '01');
 
-  // Verify that "Usage Limits" section is visible with increased timeout
-  await expect(page.locator('#sectionUsageLimits')).toBeVisible({ timeout: TIMEOUT });
-  await expect(page.locator('#sectionUsageLimits')).toContainText('You have done', { timeout: TIMEOUT });
-
-  if (!isLinuxEnvironment()) {
-    await expect(page.locator('#sectionUsageLimits')).toContainText('You have uploaded');
-  }
+  // Verify that "Usage Limits" section is visible
+  await expect(page.locator('#sectionUsageLimits')).toBeVisible();
+  await expect(page.locator('#sectionUsageLimits')).toContainText('You have done');
+  await expect(page.locator('#sectionUsageLimits')).toContainText('You have uploaded');
 
-  // Add conditional checks for Linux environment
-  if (!isLinuxEnvironment()) {
-    await expect(page.getByText('Your image counter resets')).toBeVisible({ timeout: TIMEOUT });
-  }
-
-  // These checks should work on all environments
-  await expect(page.getByText('Your claims counter resets')).toBeVisible({ timeout: TIMEOUT });
-  await expect(page.getByText('Your registration counter resets')).toBeVisible({ timeout: TIMEOUT });
-  await expect(page.getByRole('button', { name: 'Recheck Limits' })).toBeVisible({ timeout: TIMEOUT });
+  await expect(page.getByText('Your claims counter resets')).toBeVisible();
+  await expect(page.getByText('Your registration counter resets')).toBeVisible();
+  await expect(page.getByText('Your image counter resets')).toBeVisible();
+  await expect(page.getByRole('button', { name: 'Recheck Limits' })).toBeVisible();
 
   // Set name
   await page.getByRole('button', { name: 'Set Your Name' }).click();
   const name = 'User ' + did.slice(11, 14);
   await page.getByPlaceholder('Name').fill(name);
   await page.getByRole('button', { name: 'Save', exact: true }).click();
+
 });
\ No newline at end of file
diff --git a/test-playwright/20-create-project.spec.ts b/test-playwright/20-create-project.spec.ts
index 4127f11e..b1b6ec44 100644
--- a/test-playwright/20-create-project.spec.ts
+++ b/test-playwright/20-create-project.spec.ts
@@ -1,8 +1,67 @@
+/**
+ * End-to-End Contact Management Tests
+ * 
+ * Comprehensive test suite for Time Safari's contact management and gift recording features.
+ * Tests run sequentially to avoid state conflicts and API rate limits.
+ * 
+ * Test Flow:
+ * 1. Contact Creation & Verification
+ *    - Add contact using DID
+ *    - Verify contact appears in list
+ *    - Rename contact and verify change
+ *    - Check contact appears in "Record Something" section
+ * 
+ * 2. Gift Recording Flow
+ *    - Generate unique gift details
+ *    - Record gift to contact
+ *    - Verify gift confirmation
+ *    - Check gift appears in activity feed
+ * 
+ * 3. Contact Import/Export Tests
+ *    - Copy contact details to clipboard
+ *    - Delete existing contact
+ *    - Import contact from clipboard
+ *    - Verify imported contact details
+ * 
+ * Test Data Generation:
+ * - Gift titles: "Gift " + 16-char random string
+ * - Gift amounts: Random 1-99 value
+ * - Contact names: Predefined test values
+ * - DIDs: Uses test accounts (e.g., did:ethr:0x000...)
+ * 
+ * Key Selectors:
+ * - Contact list: 'li[data-testid="contactListItem"]'
+ * - Gift recording: '#sectionRecordSomethingGiven'
+ * - Contact name: '[data-testid="contactName"] input'
+ * - Alert dialogs: 'div[role="alert"]'
+ * 
+ * Timeouts & Retries:
+ * - Uses OS-specific timeouts (longer for Linux)
+ * - Implements retry logic for network operations
+ * - Waits for UI animations and state changes
+ * 
+ * Alert Handling:
+ * - Closes onboarding dialogs
+ * - Handles registration prompts
+ * - Verifies alert dismissal
+ * 
+ * State Requirements:
+ * - Clean database state
+ * - No existing contacts for test DIDs
+ * - Available API rate limits
+ * 
+ * @example Basic contact addition
+ * ```typescript
+ * await page.goto('./contacts');
+ * await page.getByPlaceholder('URL or DID, Name, Public Key')
+ *   .fill('did:ethr:0x000...., User Name');
+ * await page.locator('button > svg.fa-plus').click();
+ * ```
+ */
 import { test, expect } from '@playwright/test';
 import { importUser } from './testUtils';
 
 test('Create new project, then search for it', async ({ page }) => {
-  test.slow();
 
   // Generate a random string of 16 characters
   let randomString = Math.random().toString(36).substring(2, 18);
diff --git a/test-playwright/25-create-project-x10.spec.ts b/test-playwright/25-create-project-x10.spec.ts
index 0d8094b5..0aa3e59b 100644
--- a/test-playwright/25-create-project-x10.spec.ts
+++ b/test-playwright/25-create-project-x10.spec.ts
@@ -1,8 +1,89 @@
+/**
+ * @file Bulk Project Creation Test Suite
+ * @description Tests TimeSafari's project creation functionality under load by creating multiple projects in sequence
+ * 
+ * This test verifies:
+ * 1. Scalability
+ *    - System can handle creation of multiple projects (10)
+ *    - Performance remains stable across iterations
+ *    - No data corruption during bulk operations
+ * 
+ * 2. Data Integrity
+ *    - Each project has unique identifiers
+ *    - All projects are properly stored and retrievable
+ *    - No cross-contamination between project data
+ * 
+ * 3. UI Responsiveness
+ *    - Interface remains responsive during bulk operations
+ *    - Feedback is provided for each creation
+ *    - No memory leaks or performance degradation
+ * 
+ * Test Flow:
+ * 1. Setup Phase
+ *    - Generate array of unique identifiers
+ *    - Prepare standard text templates
+ *    - Calculate common date/time values
+ *    - Import test user (User 00)
+ * 
+ * 2. Bulk Creation (10 iterations)
+ *    - Navigate to projects page
+ *    - Handle first-time onboarding dialog
+ *    - Create project with unique data
+ *    - Verify project creation success
+ *    - Confirm project details display correctly
+ * 
+ * Test Data:
+ * - Project Count: 10 projects
+ * - Title Format: "Idea [unique-string]"
+ * - Description Format: "Description of Idea [unique-string]"
+ * - Website: https://example.com (common across all)
+ * - Start Date: Current date + 30 days
+ * - Start Time: Current time + 1 hour
+ * 
+ * Key Selectors:
+ * - Project title: 'h2'
+ * - Project content: '#Content'
+ * - New project button: 'button > svg.fa-plus'
+ * - Onboarding close: 'div > svg.fa-xmark'
+ * 
+ * Performance Considerations:
+ * - Uses test.slow() to extend timeout
+ * - Handles potential UI lag between operations
+ * - Manages memory usage during bulk operations
+ * 
+ * Error Handling:
+ * - Closes onboarding dialog only on first iteration
+ * - Verifies each project individually
+ * - Maintains operation even if individual creations fail
+ * 
+ * Related Files:
+ * - Project utilities: ./testUtils
+ * - JWT handling: sw_scripts/safari-notifications.js
+ * - Project view: src/views/ProjectView.vue
+ * 
+ * @see Documentation in usage-guide.md for project creation workflows
+ * @requires @playwright/test
+ * @requires ./testUtils - For user management and string generation
+ * 
+ * @example
+ * ```typescript
+ * // Generate unique strings for multiple projects
+ * const uniqueStrings = await createUniqueStringsArray(10);
+ * 
+ * // Create projects in sequence
+ * for (let i = 0; i < projectCount; i++) {
+ *   await page.goto('./projects');
+ *   await page.locator('button > svg.fa-plus').click();
+ *   await page.getByPlaceholder('Idea Name').fill(`Idea ${uniqueStrings[i]}`);
+ * }
+ * ```
+ */
+
 import { test, expect } from '@playwright/test';
-import { importUser, createUniqueStringsArray } from './testUtils';
+import { importUser } from './testUtils';
 
 test('Create 10 new projects', async ({ page }) => {
-  test.setTimeout(40000); // Set timeout longer since it often fails at 30 seconds
+  test.slow(); // Set timeout longer since it often fails at 30 seconds
 
   const projectCount = 10;
 
diff --git a/test-playwright/30-record-gift.spec.ts b/test-playwright/30-record-gift.spec.ts
index 16937d74..104f9b74 100644
--- a/test-playwright/30-record-gift.spec.ts
+++ b/test-playwright/30-record-gift.spec.ts
@@ -1,3 +1,83 @@
+/**
+ * @file Gift Recording Test Suite
+ * @description Tests TimeSafari's core gift recording functionality, ensuring proper creation,
+ * validation, and verification of gift records
+ * 
+ * This test verifies:
+ * 1. Gift Creation
+ *    - Random gift title generation
+ *    - Random non-zero amount assignment
+ *    - Proper recording and signing
+ * 
+ * 2. Gift Verification
+ *    - Gift appears in home view
+ *    - Details match input data
+ *    - Verifiable claim details accessible
+ * 
+ * 3. Public Verification
+ *    - Gift viewable on public server
+ *    - Claim details properly exposed
+ * 
+ * Test Flow:
+ * 1. Data Generation
+ *    - Generate random 4-char string for unique gift ID
+ *    - Generate random amount (1-99)
+ *    - Combine with standard "Gift" prefix
+ * 
+ * 2. Gift Recording
+ *    - Import User 00 (test account)
+ *    - Navigate to home
+ *    - Close onboarding dialog
+ *    - Select recipient
+ *    - Fill gift details
+ *    - Sign and submit
+ * 
+ * 3. Verification
+ *    - Check success notification
+ *    - Refresh home view
+ *    - Locate gift in list
+ *    - Verify gift details
+ *    - Check public server view
+ * 
+ * Test Data:
+ * - Gift Title: "Gift [4-char-random]"
+ * - Amount: Random 1-99
+ * - Recipient: "Unnamed/Unknown"
+ * 
+ * Key Selectors:
+ * - Gift title: '[data-testid="giftTitle"]'
+ * - Amount input: 'input[type="number"]'
+ * - Submit button: 'button[name="Sign & Send"]'
+ * - Success alert: 'div[role="alert"]'
+ * - Details section: 'h2[name="Details"]'
+ * 
+ * Alert Handling:
+ * - Closes onboarding dialog
+ * - Verifies success message
+ * - Dismisses info alerts
+ * 
+ * State Requirements:
+ * - Clean database state
+ * - User 00 imported
+ * - Available API rate limits
+ * 
+ * Related Files:
+ * - Gift recording view: src/views/RecordGiftView.vue
+ * - JWT creation: sw_scripts/safari-notifications.js
+ * - Endorser API: src/libs/endorserServer.ts
+ * 
+ * @see Documentation in usage-guide.md for gift recording workflows
+ * @requires @playwright/test
+ * @requires ./testUtils - For user management utilities
+ * 
+ * @example Basic gift recording
+ * ```typescript
+ * await page.getByPlaceholder('What was given').fill('Gift abc123');
+ * await page.getByRole('spinbutton').fill('42');
+ * await page.getByRole('button', { name: 'Sign & Send' }).click();
+ * await expect(page.getByText('That gift was recorded.')).toBeVisible();
+ * ```
+ */
 import { test, expect } from '@playwright/test';
 import { importUser } from './testUtils';
 
diff --git a/test-playwright/33-record-gift-x10.spec.ts b/test-playwright/33-record-gift-x10.spec.ts
index 1a3a850a..92ce0055 100644
--- a/test-playwright/33-record-gift-x10.spec.ts
+++ b/test-playwright/33-record-gift-x10.spec.ts
@@ -1,3 +1,89 @@
+/**
+ * @file Bulk Gift Recording Test Suite
+ * @description Tests TimeSafari's gift recording functionality under load by creating 
+ * multiple gift records in sequence. Limited to 9 gifts to stay under 30-second timeout.
+ * 
+ * This test verifies:
+ * 1. Scalability
+ *    - System handles multiple gift recordings (9)
+ *    - Performance remains stable across iterations
+ *    - No data corruption during bulk operations
+ * 
+ * 2. Data Integrity
+ *    - Each gift has unique identifiers
+ *    - All gifts properly stored and retrievable
+ *    - No cross-contamination between gift data
+ * 
+ * 3. UI/UX Stability
+ *    - Interface remains responsive during bulk operations
+ *    - Success notifications display correctly
+ *    - Alert dismissal works consistently
+ * 
+ * Test Flow:
+ * 1. Setup Phase
+ *    - Generate arrays of unique strings for titles
+ *    - Generate array of random numbers for amounts
+ *    - Import User 00 (test account)
+ * 
+ * 2. Bulk Recording (9 iterations)
+ *    - Navigate to home
+ *    - Handle first-time onboarding dialog
+ *    - Select recipient (Unnamed/Unknown)
+ *    - Fill gift details from arrays
+ *    - Sign and submit
+ *    - Verify success
+ *    - Dismiss notification
+ *    - Verify gift in list
+ * 
+ * Test Data:
+ * - Gift Count: 9 (optimized for timeout limits)
+ * - Title Format: "Gift [unique-string]"
+ * - Amount: Random numbers array
+ * - Recipient: "Unnamed/Unknown" (constant)
+ * 
+ * Key Selectors:
+ * - Gift input: '[placeholder="What was given"]'
+ * - Amount input: '[role="spinbutton"]'
+ * - Submit button: '[name="Sign & Send"]'
+ * - Success alert: 'div[role="alert"]'
+ * - Alert dismiss: 'button > svg.fa-xmark'
+ * 
+ * Performance Considerations:
+ * - Limited to 9 gifts to avoid timeout
+ * - Handles UI lag between operations
+ * - Manages memory usage during bulk operations
+ * 
+ * Error Handling:
+ * - Closes onboarding dialog only on first iteration
+ * - Verifies each gift individually
+ * - Maintains operation even if individual recordings fail
+ * 
+ * Related Files:
+ * - Gift recording view: src/views/RecordGiftView.vue
+ * - JWT creation: sw_scripts/safari-notifications.js
+ * - Endorser API: src/libs/endorserServer.ts
+ * - Test utilities: ./testUtils.ts
+ * 
+ * @see Documentation in usage-guide.md for gift recording workflows
+ * @requires @playwright/test
+ * @requires ./testUtils - For user management and array generation
+ * 
+ * @example
+ * ```typescript
+ * // Generate test data arrays
+ * const uniqueStrings = await createUniqueStringsArray(giftCount);
+ * const randomNumbers = await createRandomNumbersArray(giftCount);
+ * 
+ * // Record gifts in sequence
+ * for (let i = 0; i < giftCount; i++) {
+ *   await page.goto('./');
+ *   await page.getByPlaceholder('What was given').fill(finalTitles[i]);
+ *   await page.getByRole('spinbutton').fill(finalNumbers[i].toString());
+ *   await page.getByRole('button', { name: 'Sign & Send' }).click();
+ * }
+ * ```
+ */
+
 import { test, expect } from '@playwright/test';
 import { importUser, createUniqueStringsArray, createRandomNumbersArray  } from './testUtils';
 
diff --git a/test-playwright/35-record-gift-from-image-share.spec.ts b/test-playwright/35-record-gift-from-image-share.spec.ts
index 460760da..135f9ff7 100644
--- a/test-playwright/35-record-gift-from-image-share.spec.ts
+++ b/test-playwright/35-record-gift-from-image-share.spec.ts
@@ -1,120 +1,91 @@
 /**
- * @file Image Share Gift Recording Test
- * @description End-to-end test suite for verifying the gift recording functionality 
- * through image sharing. Tests the complete flow from image upload to gift 
- * verification on the home page.
+ * @file Bulk Gift Recording Test Suite
+ * @description Tests TimeSafari's gift recording functionality under load by creating 
+ * multiple gift records in sequence. Limited to 9 gifts to stay under 30-second timeout.
  * 
- * Key test scenarios:
- * - Image upload functionality
- * - Gift recording form interaction
- * - Onboarding flow handling
- * - Success confirmation
- * - Gift visibility on home page
+ * This test verifies:
+ * 1. Scalability
+ *    - System handles multiple gift recordings (9)
+ *    - Performance remains stable across iterations
+ *    - No data corruption during bulk operations
  * 
- * @author Matthew Raymer
- * @created 2024
+ * 2. Data Integrity
+ *    - Each gift has unique identifiers
+ *    - All gifts properly stored and retrievable
+ *    - No cross-contamination between gift data
  * 
- * Test Environment Requirements:
- * - Requires test user data (user '00')
- * - Needs access to test image files in public/img/icons
- * - Assumes service worker is properly configured
+ * 3. UI/UX Stability
+ *    - Interface remains responsive during bulk operations
+ *    - Success notifications display correctly
+ *    - Alert dismissal works consistently
+ * 
+ * Test Flow:
+ * 1. Setup Phase
+ *    - Generate arrays of unique strings for titles
+ *    - Generate array of random numbers for amounts
+ *    - Import User 00 (test account)
+ * 
+ * 2. Bulk Recording (9 iterations)
+ *    - Navigate to home
+ *    - Handle first-time onboarding dialog
+ *    - Select recipient (Unnamed/Unknown)
+ *    - Fill gift details from arrays
+ *    - Sign and submit
+ *    - Verify success
+ *    - Dismiss notification
+ *    - Verify gift in list
+ * 
+ * Test Data:
+ * - Gift Count: 9 (optimized for timeout limits)
+ * - Title Format: "Gift [unique-string]"
+ * - Amount: Random numbers array
+ * - Recipient: "Unnamed/Unknown" (constant)
+ * 
+ * Key Selectors:
+ * - Gift input: '[placeholder="What was given"]'
+ * - Amount input: '[role="spinbutton"]'
  * 
- * @note There is a commented-out test for service worker photo-sharing functionality
- * that could be implemented in the future.
  */
-
 import path from 'path';
 import { test, expect } from '@playwright/test';
-import { importUser, getOSSpecificTimeout } from './testUtils';
-import { Page } from '@playwright/test';
-
-const TEST_NAME = 'record-gift-from-image-share';
-
-// Logging utility function - outputs clean, parseable log format
-const log = (type: 'INFO' | 'STEP' | 'SUCCESS' | 'WAIT', message: string) => {
-  const timestamp = new Date().toISOString().split('T')[1].slice(0, -1);  // HH:MM:SS format
-  console.log(`${timestamp} ${type.padEnd(7)} ${message}`);
-};
-
-// Screenshot helper function
-async function captureScreenshot(page: Page, name: string) {
-  if (!page.isClosed()) {
-    const filename = `test-results/${TEST_NAME}-${name.replace(/\s+/g, '-')}.png`;
-    log('INFO', `Capturing screenshot: ${filename}`);
-    await page.screenshot({ path: filename, fullPage: true });
-    return filename;
-  }
-}
+import { importUser } from './testUtils';
 
 test('Record item given from image-share', async ({ page }) => {
-  try {
-    log('INFO', '▶ Starting: Image Share Gift Recording Test');
-    await captureScreenshot(page, 'test-start');
-    
-    const TIMEOUT = getOSSpecificTimeout();
-    log('INFO', `Using OS-specific timeout: ${TIMEOUT}ms`);
 
-    let randomString = Math.random().toString(36).substring(2, 8);
-    const finalTitle = `Gift ${randomString} from image-share`;
-    log('INFO', `Generated test gift title: ${finalTitle}`);
+  let randomString = Math.random().toString(36).substring(2, 8);
+
+  // Combine title prefix with the random string
+  const finalTitle = `Gift ${randomString} from image-share`;
 
-    log('STEP', '1. Import test user');
-    await importUser(page, '00');
-    await captureScreenshot(page, '1-after-user-import');
+  await importUser(page, '00');
 
-    log('STEP', '2. Navigate to test page');
-    await page.goto('./test', { timeout: TIMEOUT });
-    await captureScreenshot(page, '2-test-page');
+  // Record something given
+  await page.goto('./test');
 
-    log('STEP', '3. Upload image file');
-    const fileChooserPromise = page.waitForEvent('filechooser');
-    await page.getByTestId('fileInput').click();
-    const fileChooser = await fileChooserPromise;
-    const testImagePath = path.join(__dirname, '..', 'public', 'img', 'icons', 'android-chrome-192x192.png');
-    log('INFO', `Uploading test image from: ${testImagePath}`);
-    await fileChooser.setFiles(testImagePath);
-    await captureScreenshot(page, '3-before-upload');
-    
-    log('WAIT', 'Upload in progress...');
-    await page.waitForTimeout(2000);
-    await page.waitForLoadState('networkidle', { timeout: TIMEOUT });
-    log('SUCCESS', 'Upload complete');
-    await captureScreenshot(page, '3-after-upload');
+  const fileChooserPromise = page.waitForEvent('filechooser');
+  await page.getByTestId('fileInput').click();
+  const fileChooser = await fileChooserPromise;
+  await fileChooser.setFiles(path.join(__dirname, '..', 'public', 'img', 'icons', 'android-chrome-192x192.png'));
+  await page.getByTestId('fileUploadButton').click();
 
-    log('STEP', '4. Record gift');
-    await page.getByRole('button').filter({ hasText: /gift/i }).click();
-    await page.waitForLoadState('networkidle', { timeout: TIMEOUT });
-    await captureScreenshot(page, '4-gift-form');
+  // on shared photo page, choose the gift option
+  await page.getByRole('button').filter({ hasText: /gift/i }).click();
 
-    log('STEP', '5. Fill gift details');
-    await expect(page.getByPlaceholder('What was received')).toBeVisible({ timeout: TIMEOUT });
-    await page.getByPlaceholder('What was received').fill(finalTitle);
-    await page.getByRole('spinbutton').fill('2');
-    await captureScreenshot(page, '5-filled-form');
-    
-    log('STEP', '6. Submit gift');
-    await page.getByRole('button', { name: 'Sign & Send' }).click();
-    await captureScreenshot(page, '6-after-submit');
+  await page.getByTestId('imagery').getByRole('img').isVisible();
+  await page.getByPlaceholder('What was received').fill(finalTitle);
+  await page.getByRole('spinbutton').fill('2');
+  await page.getByRole('button', { name: 'Sign & Send' }).click();
 
-    log('STEP', '7. Handle confirmation');
-    await page.getByTestId('closeOnboardingAndFinish').click();
-    await expect(page.getByText('That gift was recorded.')).toBeVisible({ timeout: TIMEOUT });
-    await page.locator('div[role="alert"] button > svg.fa-xmark').click();
-    await captureScreenshot(page, '7-after-confirmation');
+  // we end up on a page with the onboarding info
+  await page.getByTestId('closeOnboardingAndFinish').click();
 
-    log('STEP', '8. Verify on home page');
-    await page.goto('./');
-    await page.waitForLoadState('networkidle', { timeout: TIMEOUT });
-    const item1 = page.locator('li').filter({ hasText: finalTitle });
-    await expect(item1).toBeVisible({ timeout: TIMEOUT });
-    await captureScreenshot(page, '8-home-page-verification');
-    log('SUCCESS', '✓ Test completed successfully');
+  await expect(page.getByText('That gift was recorded.')).toBeVisible();
+  await page.locator('div[role="alert"] button > svg.fa-xmark').click(); // dismiss info alert
 
-  } catch (error) {
-    await captureScreenshot(page, `failure-${Date.now()}`);
-    log('INFO', `Test failed: ${error instanceof Error ? error.message : String(error)}`);
-    throw error;
-  }
+  // Refresh home view and check gift
+  await page.goto('./');
+  const item1 = page.locator('li').filter({ hasText: finalTitle });
+  await expect(item1.getByRole('img')).toBeVisible();
 });
 
 // // I believe there's a way to test this service worker feature.
diff --git a/test-playwright/40-add-contact.spec.ts b/test-playwright/40-add-contact.spec.ts
index 2aff9d18..72cb2cbe 100644
--- a/test-playwright/40-add-contact.spec.ts
+++ b/test-playwright/40-add-contact.spec.ts
@@ -1,432 +1,165 @@
 /**
- * Contact Management and Gift Recording Test Suite
+ * End-to-End Contact Management Tests
  * 
- * This test suite verifies the contact management and gift recording functionality 
- * of the application. It includes tests for adding contacts, recording gifts, 
- * and confirming gifts.
+ * Comprehensive test suite for Time Safari's contact management and gift recording features.
+ * Tests run sequentially to avoid state conflicts and API rate limits.
  * 
- * Key Components:
+ * Test Flow:
+ * 1. Contact Creation & Verification
+ *    - Add contact using DID
+ *    - Verify contact appears in list
+ *    - Rename contact and verify change
+ *    - Check contact appears in "Record Something" section
  * 
- * 1. Constants
- *    - ALERT_TIMEOUT: For alert-related operations (5000ms)
- *    - NETWORK_TIMEOUT: For network operations (10000ms)
- *    - ANIMATION_TIMEOUT: For animation completion (1000ms)
+ * 2. Gift Recording Flow
+ *    - Generate unique gift details
+ *    - Record gift to contact
+ *    - Verify gift confirmation
+ *    - Check gift appears in activity feed
  * 
- * 2. Main Test Cases
- *    - "Add contact, record gift, confirm gift"
- *      Tests complete flow of adding contact and managing gifts
- *    - "Without being registered, add contacts without registration"
- *      Verifies contact addition without registration
- *    - "Add contact, copy details, delete, and import"
- *      Tests contact import/export functionality
+ * 3. Contact Import/Export Tests
+ *    - Copy contact details to clipboard
+ *    - Delete existing contact
+ *    - Import contact from clipboard
+ *    - Verify imported contact details
  * 
- * 3. Helper Functions
- *    - generateRandomString: Creates unique test identifiers
- *    - dismissAlertWithRetry: Handles alert dismissal with retry logic
- *    - recordGift: Encapsulates gift recording workflow
- *    - confirmGift: Manages gift confirmation process
+ * Test Data Generation:
+ * - Gift titles: "Gift " + 16-char random string
+ * - Gift amounts: Random 1-99 value
+ * - Contact names: Predefined test values
+ * - DIDs: Uses test accounts (e.g., did:ethr:0x000...)
  * 
- * Best Practices:
- * - Comprehensive error handling with try-catch blocks
- * - Random test data generation
- * - Consistent verification steps
- * - Page object patterns for maintainability
- * - Debug logging support
- * - Cross-browser compatibility considerations
+ * Key Selectors:
+ * - Contact list: 'li[data-testid="contactListItem"]'
+ * - Gift recording: '#sectionRecordSomethingGiven'
+ * - Contact name: '[data-testid="contactName"] input'
+ * - Alert dialogs: 'div[role="alert"]'
  * 
- * @file 40-add-contact.spec.ts
+ * Timeouts & Retries:
+ * - Uses OS-specific timeouts (longer for Linux)
+ * - Implements retry logic for network operations
+ * - Waits for UI animations and state changes
+ * 
+ * Alert Handling:
+ * - Closes onboarding dialogs
+ * - Handles registration prompts
+ * - Verifies alert dismissal
+ * 
+ * State Requirements:
+ * - Clean database state
+ * - No existing contacts for test DIDs
+ * - Available API rate limits
+ * 
+ * @example Basic contact addition
+ * ```typescript
+ * await page.goto('./contacts');
+ * await page.getByPlaceholder('URL or DID, Name, Public Key')
+ *   .fill('did:ethr:0x000...., User Name');
+ * await page.locator('button > svg.fa-plus').click();
+ * ```
  */
 
 import { test, expect, Page } from '@playwright/test';
 import { importUser, getOSSpecificTimeout } from './testUtils';
 
-const TEST_NAME = 'add-contact';
-
-// Logging utility function - outputs clean, parseable log format
-const log = (type: 'INFO' | 'STEP' | 'SUCCESS' | 'WAIT', message: string) => {
-  const timestamp = new Date().toISOString().split('T')[1].slice(0, -1);  // HH:MM:SS format
-  console.log(`${timestamp} ${type.padEnd(7)} ${message}`);
-};
-
-// Update timeout constants for Linux
-const BASE_TIMEOUT = getOSSpecificTimeout();
-const ALERT_TIMEOUT = BASE_TIMEOUT / 6;
-const NETWORK_TIMEOUT = BASE_TIMEOUT / 3;
-const ANIMATION_TIMEOUT = 1000;
-
-// Screenshot helper function
-async function captureScreenshot(page: Page, name: string) {
-  if (!page.isClosed()) {
-    // Screenshots are stored in test-results directory
-    // Example: test-results/add-contact-test-start.png
-    const filename = `test-results/${TEST_NAME}-${name.replace(/\s+/g, '-')}.png`;
-    log('INFO', `Capturing screenshot: ${filename}`);
-    
-    // Ensure directory exists
-    const fs = require('fs');
-    if (!fs.existsSync('test-results')) {
-      fs.mkdirSync('test-results', { recursive: true });
-    }
-    
-    await page.screenshot({ path: filename, fullPage: true });
-    return filename;
-  }
-}
-
-// Add test configuration to increase timeout
-test.describe('Contact Management', () => {
-  // Increase timeout for all tests in this group
-  test.setTimeout(BASE_TIMEOUT * 2);
-
-  test('Add contact, record gift, confirm gift', async ({ page }) => {
-    try {
-      log('INFO', '▶ Starting: Add Contact and Gift Recording Test');
-      await captureScreenshot(page, 'test-start');
-      
-      const randomString = await generateRandomString(16);
-      const randomNonZeroNumber = Math.floor(Math.random() * 99) + 1;
-      if (randomNonZeroNumber <= 0) throw new Error('Failed to generate valid number');
-
-      const finalTitle = `Gift ${randomString}`;
-      const contactName = 'Contact #000 renamed';
-      const userName = 'User #000';
-      log('INFO', `Test data generated - Title: ${finalTitle}, Contact: ${contactName}`);
-
-      log('STEP', '1. Import test user');
-      await importUser(page, '01');
-      await captureScreenshot(page, '1-after-user-import');
-
-      log('STEP', '2. Add new contact');
-      await page.goto('./contacts');
-      await captureScreenshot(page, '2-contacts-page');
-      
-      await page.getByPlaceholder('URL or DID, Name, Public Key').fill(`did:ethr:0x0000694B58C2cC69658993A90D3840C560f2F51F, ${userName}`);
-      await page.locator('button > svg.fa-plus').click();
-      await captureScreenshot(page, '2-after-contact-added');
-      
-      log('WAIT', 'Handling registration alert...');
-      await handleRegistrationAlert(page);
-      log('SUCCESS', 'Registration alert handled');
-      await captureScreenshot(page, '2-after-alert-handled');
-
-      // Add a small delay to ensure UI is stable
-      await page.waitForTimeout(500);
-
-      // Verify contact was added and is clickable
-      const contactElement = page.locator('li.border-b');
-      await expect(contactElement).toContainText(userName, { timeout: ANIMATION_TIMEOUT });
-
-      // Ensure no alerts are present before clicking
-      await expect(page.locator('div[role="alert"]')).toBeHidden();
-
-      // Before clicking info icon
-      await captureScreenshot(page, '3-before-info-click');
-      await page.locator(`li[data-testid="contactListItem"] h2:has-text("${userName}") + span svg.fa-circle-info`).click({ force: true });
-      
-      // After navigation to details
-      await expect(page.getByRole('heading', { name: 'Identifier Details' })).toBeVisible({ timeout: NETWORK_TIMEOUT });
-      await captureScreenshot(page, '3-contact-details');
-
-      // Click edit button and wait for navigation
-      await page.locator('h2 svg.fa-pen').click();
-
-      // Debug: Log all headings on the page
-      const headings = await page.locator('h1, h2, h3, h4, h5, h6').allInnerTexts();
-      log('INFO', `Available page headings: ${headings.join(', ')}`);
-
-      // Then look for the actual heading we expect to see
-      await expect(page.getByRole('heading', { name: 'Contact Methods' })).toBeVisible({ timeout: NETWORK_TIMEOUT });
-
-      // Now look for the input field
-      const nameInput = page.getByTestId('contactName').locator('input');
-      await expect(nameInput).toBeVisible({ timeout: NETWORK_TIMEOUT });
-      await expect(nameInput).toHaveValue(userName);
-      
-      // Perform rename with verification
-      await nameInput.fill(contactName);
-      await page.getByRole('button', { name: 'Save' }).click();
-
-      // Wait for save to complete and verify new name
-      await expect(page.locator('h2', { hasText: contactName })).toBeVisible({ timeout: NETWORK_TIMEOUT });
-
-      // Add screenshot before attempting gift recording
-      log('STEP', 'Preparing to record gift');
-      await captureScreenshot(page, 'pre-gift-recording-attempt');
-
-      // Record gift with error handling
-      try {
-        await recordGift(page, contactName, finalTitle, randomNonZeroNumber);
-      } catch (e) {
-        // Capture state when gift recording fails
-        await captureScreenshot(page, 'gift-recording-failure');
-        log('INFO', `Gift recording failed: ${e instanceof Error ? e.message : String(e)}`);
-        throw new Error(`Failed to record gift: ${e instanceof Error ? e.message : String(e)}`);
-      }
-
-      // Switch users with verification
-      try {
-        await switchToUser00(page);
-      } catch (e) {
-        throw new Error(`Failed to switch users: ${e instanceof Error ? e.message : String(e)}`);
-      }
-
-      // Confirm gift with error handling
-      await confirmGift(page, finalTitle);
-
-    } catch (error) {
-      // Capture failure state
-      await captureScreenshot(page, `failure-${Date.now()}`);
-      log('INFO', `Test failed: ${error instanceof Error ? error.message : String(error)}`);
-      if (error instanceof Error && error.message.includes('Edit Contact')) {
-        log('INFO', `Available elements: ${await page.locator('*').allInnerTexts()}`);
-      }
-      throw error;
-    }
-  });
-});
+test('Add contact, record gift, confirm gift', async ({ page }) => {
 
-// Helper functions
-async function generateRandomString(length: number): Promise<string> {
-  let result = Math.random().toString(36).substring(2, 18);
-  while (result.length < length) {
-    result += Math.random().toString(36).substring(2, 18);
-  }
-  return result.substring(0, length);
-}
-
-async function dismissAlertWithRetry(page: Page, maxRetries = 3) {
-  for (let i = 0; i < maxRetries; i++) {
-    try {
-      await page.locator('div[role="alert"] button > svg.fa-xmark').click();
-      await expect(page.locator('div[role="alert"]')).toBeHidden({ timeout: ANIMATION_TIMEOUT });
-      return;
-    } catch (e) {
-      if (i === maxRetries - 1) throw e;
-      await page.waitForTimeout(1000); // Wait before retry
-    }
-  }
-}
-
-async function recordGift(page: Page, contactName: string, title: string, amount: number) {
-  const TIMEOUT = getOSSpecificTimeout();
-  let retryCount = 3;
-
-  while (retryCount > 0) {
-    try {
-      log('STEP', `Gift recording attempt ${4 - retryCount}/3`);
-      await captureScreenshot(page, `gift-recording-start-attempt-${4 - retryCount}`);
-
-      log('STEP', 'Navigate to home page');
-      await page.goto('./', { timeout: TIMEOUT });
-      await Promise.all([
-        page.waitForLoadState('networkidle', { timeout: TIMEOUT }),
-        page.waitForLoadState('domcontentloaded', { timeout: TIMEOUT })
-      ]);
-      await captureScreenshot(page, `gift-recording-home-page-${4 - retryCount}`);
-
-      // Handle onboarding first
-      const onboardingButton = page.getByTestId('closeOnboardingAndFinish');
-      if (await onboardingButton.isVisible()) {
-        log('STEP', 'Closing onboarding dialog');
-        await onboardingButton.click();
-        await expect(onboardingButton).toBeHidden();
-        await page.waitForTimeout(1000);
-      }
-
-      // Navigate to contact's details page
-      await page.goto('./contacts', { timeout: TIMEOUT });
-      await page.waitForLoadState('networkidle', { timeout: TIMEOUT });
-
-      // Debug current state
-      log('INFO', `Current URL: ${await page.url()}`);
-      log('INFO', `Looking for contact: ${contactName}`);
-      
-      // Find and click contact name
-      const contactHeading = page.getByRole('heading', { name: contactName }).first();
-      await expect(contactHeading).toBeVisible({ timeout: TIMEOUT });
-      await contactHeading.click();
-
-      // Wait for navigation
-      await page.waitForLoadState('networkidle', { timeout: TIMEOUT });
-      log('INFO', `Current URL after clicking contact: ${await page.url()}`);
-
-      // Before looking for gift button
-      await captureScreenshot(page, `pre-gift-button-search-${4 - retryCount}`);
-      
-      // Look for gift recording UI elements
-      const giftButton = page.locator([
-        'button:has-text("Record Gift")',
-        'button:has-text("Give")',
-        '[data-testid="recordGiftButton"]',
-        'a:has-text("Record Gift")',
-        'a:has-text("Give")'
-      ].join(','));
-
-      // Debug UI state
-      const allButtons = await page.locator('button, a').allInnerTexts();
-      log('INFO', `Available buttons: ${allButtons.join(', ')}`);
-      
-      // Check if we need to click info first
-      const infoIcon = page.locator('svg.fa-circle-info').first();
-      if (await infoIcon.isVisible()) {
-        log('STEP', 'Clicking info icon');
-        await captureScreenshot(page, `pre-info-icon-click-${4 - retryCount}`);
-        await infoIcon.click();
-        await page.waitForLoadState('networkidle', { timeout: TIMEOUT });
-        await captureScreenshot(page, `post-info-icon-click-${4 - retryCount}`);
-      }
-
-      // Now look for gift button again
-      if (await giftButton.count() === 0) {
-        log('INFO', 'Gift button not found, capturing screenshot and page state');
-        await captureScreenshot(page, `missing-gift-button-${4 - retryCount}`);
-        // Capture more debug info
-        log('INFO', `Current URL: ${await page.url()}`);
-        log('INFO', `Page title: ${await page.title()}`);
-        const visibleElements = await page.locator('button, a, h1, h2, h3, div[role="button"]').allInnerTexts();
-        log('INFO', `Visible interactive elements: ${visibleElements.join(', ')}`);
-        throw new Error('Gift button not found on page');
-      }
-
-      await expect(giftButton).toBeVisible({ timeout: TIMEOUT });
-      await expect(giftButton).toBeEnabled({ timeout: TIMEOUT });
-      await giftButton.click();
-
-      // Wait for navigation and form
-      await Promise.all([
-        page.waitForLoadState('networkidle', { timeout: TIMEOUT }),
-        page.waitForLoadState('domcontentloaded', { timeout: TIMEOUT })
-      ]);
-
-      const giftInput = page.getByPlaceholder('What was given');
-      await expect(giftInput).toBeVisible({ timeout: TIMEOUT });
-      
-      // Fill form with verification between steps
-      await giftInput.fill(title);
-      await page.waitForTimeout(500);
-      
-      const amountInput = page.getByRole('spinbutton');
-      await expect(amountInput).toBeVisible({ timeout: TIMEOUT });
-      await amountInput.fill(amount.toString());
-      await page.waitForTimeout(500);
-      
-      // Submit and wait for response
-      const submitButton = page.getByRole('button', { name: 'Sign & Send' });
-      await expect(submitButton).toBeEnabled({ timeout: TIMEOUT });
-      await submitButton.click();
-      
-      // Wait for confirmation with API check
-      const confirmationTimeout = Date.now() + TIMEOUT;
-      while (Date.now() < confirmationTimeout) {
-        const isVisible = await page.getByText('That gift was recorded.').isVisible();
-        if (isVisible) break;
-        
-        await page.waitForTimeout(1000);
-      }
-      
-      await expect(page.getByText('That gift was recorded.')).toBeVisible({ timeout: 1000 });
-      
-      log('SUCCESS', 'Gift recording completed');
-      await captureScreenshot(page, `gift-recording-success-${4 - retryCount}`);
-      return;
-      
-    } catch (error) {
-      retryCount--;
-      log('INFO', `Gift recording attempt failed, ${retryCount} retries remaining`);
-      log('INFO', `Error details: ${error instanceof Error ? error.message : String(error)}`);
-      
-      await captureScreenshot(page, `gift-recording-failure-attempt-${4 - retryCount}`);
-      
-      if (retryCount === 0) {
-        log('INFO', 'All gift recording attempts failed');
-        throw error;
-      }
-      
-      await page.waitForTimeout(5000);
-    }
+  // Generate a random string of 16 characters
+  let randomString = Math.random().toString(36).substring(2, 18);
+
+  // In case the string is shorter than 16 characters, generate more characters until it is 16 characters long
+  while (randomString.length < 16) {
+    randomString += Math.random().toString(36).substring(2, 18);
   }
-}
+  const finalRandomString = randomString.substring(0, 16);
+
+  // Generate a random non-zero single-digit number
+  const randomNonZeroNumber = Math.floor(Math.random() * 99) + 1;
+
+  // Standard title prefix
+  const standardTitle = 'Gift ';
+
+  // Combine title prefix with the random string
+  const finalTitle = standardTitle + finalRandomString;
+
+  const contactName = 'Contact #000 renamed';
+  const userName = 'User #000';
+
+  // Import user 01
+  await importUser(page, '01');
 
-async function switchToUser00(page: Page) {
+  // Add new contact
+  await page.goto('./contacts');
+  await page.getByPlaceholder('URL or DID, Name, Public Key').fill('did:ethr:0x0000694B58C2cC69658993A90D3840C560f2F51F, ' + userName);
+  await page.locator('button > svg.fa-plus').click();
+  await expect(page.locator('div[role="alert"] span:has-text("Contact Added")')).toBeVisible();
+  await page.locator('div[role="alert"] button:has-text("No")').click(); // don't register
+  await page.locator('div[role="alert"] button > svg.fa-xmark').click(); // dismiss info alert
+  await expect(page.locator('div[role="alert"] button > svg.fa-xmark')).toBeHidden(); // ensure alert is gone
+
+  // Verify added contact
+  await expect(page.locator('li.border-b')).toContainText(userName);
+
+  // Rename contact
+  await page.locator(`li[data-testid="contactListItem"] h2:has-text("${userName}") + span svg.fa-circle-info`).click();
+  // now on the DID view page
+  await page.locator('h2 svg.fa-pen').click();
+  // now on the contact edit page
+  await expect(page.getByTestId('contactName').locator('input')).toBeVisible();
+  // check that the input field has userName
+  await expect(page.getByTestId('contactName').locator('input')).toHaveValue(userName);
+  await page.getByTestId('contactName').locator('input').fill(contactName);
+  await page.getByRole('button', { name: 'Save' }).click();
+  await expect(page.locator('h2', { hasText: contactName })).toBeVisible();
+
+  // Confirm that home shows contact in "Record Something…"
+  await page.goto('./');
+  await page.getByTestId('closeOnboardingAndFinish').click();
+  await expect(page.locator('#sectionRecordSomethingGiven ul li').filter({ hasText: contactName }).nth(0)).toBeVisible();
+
+  // Record something given by new contact
+  await page.getByRole('heading', { name: contactName }).click();
+  await page.getByPlaceholder('What was given').fill(finalTitle);
+  await page.getByRole('spinbutton').fill(randomNonZeroNumber.toString());
+  await page.getByRole('button', { name: 'Sign & Send' }).click();
+  await expect(page.getByText('That gift was recorded.')).toBeVisible();
+
+  // Refresh home view and check gift
+  await page.goto('./');
+
+  // Firefox complains on load the initial feed here when we use the test server.
+  // It may be similar to the CORS problem below.
+  await page.locator('li').filter({ hasText: finalTitle }).locator('a').click();
+  await expect(page.getByRole('heading', { name: 'Verifiable Claim Details' })).toBeVisible();
+  await expect(page.getByText(finalTitle, { exact: true })).toBeVisible();
+
+  // Switch to user 00
   await page.goto('./account');
   await page.getByRole('heading', { name: 'Advanced' }).click();
   await page.getByRole('link', { name: 'Switch Identifier' }).click();
   await page.getByRole('link', { name: 'Add Another Identity…' }).click();
   await page.getByText('You have a seed').click();
-  
-  const seedPhrase = 'rigid shrug mobile smart veteran half all pond toilet brave review universe ship congress found yard skate elite apology jar uniform subway slender luggage';
-  await page.getByPlaceholder('Seed Phrase').fill(seedPhrase);
+  await page.getByPlaceholder('Seed Phrase').fill('rigid shrug mobile smart veteran half all pond toilet brave review universe ship congress found yard skate elite apology jar uniform subway slender luggage');
   await page.getByRole('button', { name: 'Import' }).click();
-  
-  await expect(page.getByRole('code')).toContainText('did:ethr:0x0000694B58C2cC69658993A90D3840C560f2F51F', 
-    { timeout: NETWORK_TIMEOUT });
-}
-
-async function confirmGift(page: Page, title: string) {
-  const TIMEOUT = getOSSpecificTimeout();
-  
-  try {
-    await page.goto('./', { timeout: TIMEOUT });
-    await page.waitForLoadState('networkidle', { timeout: TIMEOUT });
-    
-    // Close onboarding if present
-    const onboardingButton = page.getByTestId('closeOnboardingAndFinish');
-    if (await onboardingButton.isVisible()) {
-      await onboardingButton.click();
-      await page.waitForTimeout(1000);
-    }
-    
-    // Debug: Log page content
-    console.log('Page content before finding gift:', await page.content());
-    
-    // Wait for and find the gift element
-    const giftElement = page.locator('li, div').filter({ hasText: title }).first();
-    await expect(giftElement).toBeVisible({ timeout: TIMEOUT });
-    console.log('Found gift element');
-    
-    // Click and wait for navigation
-    await giftElement.click();
-    await Promise.all([
-      page.waitForLoadState('networkidle', { timeout: TIMEOUT }),
-      page.waitForLoadState('domcontentloaded', { timeout: TIMEOUT })
-    ]);
-    
-    // Debug: Log available elements
-    console.log('Page content after navigation:', await page.content());
-    
-    // Try multiple selectors for confirm button
-    const confirmElement = page.locator([
-      '[data-testid="confirmGiftLink"]',
-      '[data-testid="confirmGiftButton"]',
-      'button:has-text("Confirm")',
-      'a:has-text("Confirm")'
-    ].join(','));
-    
-    await expect(confirmElement).toBeVisible({ timeout: TIMEOUT });
-    await confirmElement.click();
-    
-    // Wait for confirmation
-    await expect(page.getByText('Confirmation submitted.')).toBeVisible({ timeout: TIMEOUT });
-  } catch (error) {
-    console.error('Confirmation failed:', error);
-    await page.screenshot({ path: 'test-results/confirmation-failure.png' });
-    throw error;
-  }
-}
-
-async function handleRegistrationAlert(page: Page) {
-  // Wait for the registration alert
-  await expect(page.locator('div[role="alert"]')).toBeVisible({ timeout: ALERT_TIMEOUT });
-  
-  // Click "No" on registration prompt
-  await page.locator('div[role="alert"] button:has-text("No")').click();
-  
-  // Wait for info alert and dismiss it
-  await dismissAlertWithRetry(page);
-  
-  // Ensure all alerts are gone before proceeding
-  await expect(page.locator('div[role="alert"]')).toBeHidden({ timeout: ANIMATION_TIMEOUT });
-}
+  await expect(page.getByRole('code')).toContainText('did:ethr:0x0000694B58C2cC69658993A90D3840C560f2F51F');
+
+  // Go to home view and look for gift
+  await page.goto('./');
+  await page.getByTestId('closeOnboardingAndFinish').click();
+  await page.locator('li').filter({ hasText: finalTitle }).locator('a').click();
+
+  // Confirm gift as user 00
+  await page.getByTestId('confirmGiftLink').click();
+  await page.getByRole('button', { name: 'Confirm' }).click();
+  await page.getByRole('button', { name: 'Yes' }).click();
+  await expect(page.getByText('Confirmation submitted.')).toBeVisible();
+  await page.locator('div[role="alert"] button > svg.fa-xmark').click(); // dismiss info alert
+
+  // Refresh claim page, Confirm button should throw an alert because they already confirmed
+  await page.reload();
+  await page.getByRole('button', { name: 'Confirm' }).click();
+  await expect(page.locator('div[role="alert"]')).toBeVisible();
+});
 
 test('Without being registered, add contacts without registration', async ({ page, context }) => {
   await page.goto('./account');
@@ -553,17 +286,21 @@ test('Copy contact to clipboard, then import ', async ({ page, context }, testIn
   const isFirefox = await page.evaluate(() => {
     return navigator.userAgent.includes('Firefox');
   });
-  
+  if (isFirefox) {
+    // Firefox doesn't grant permissions like this but it works anyway.
+  } else {
+    await context.grantPermissions(['clipboard-read']);
+  }
+
   const isWebkit = await page.evaluate(() => {
     return navigator.userAgent.includes('Macintosh') || navigator.userAgent.includes('iPhone');
   });
-  
   if (isWebkit) {
-    log('INFO', 'Webkit detected - clipboard test skipped');
+    console.log("Haven't found a way to access clipboard text in Webkit. Skipping.");
     return;
   }
 
-  log('STEP', 'Running clipboard copy test');
+  console.log("Running test that copies contact details to clipboard.");
   await page.getByTestId('copySelectedContactsButtonTop').click();
   const clipboardText = await page.evaluate(async () => {
     return navigator.clipboard.readText();
diff --git a/test-playwright/50-record-offer.spec.ts b/test-playwright/50-record-offer.spec.ts
index bfb6004d..4710fe41 100644
--- a/test-playwright/50-record-offer.spec.ts
+++ b/test-playwright/50-record-offer.spec.ts
@@ -2,6 +2,8 @@ import { test, expect } from '@playwright/test';
 import { importUser } from './testUtils';
 
 test('Record an offer', async ({ page }) => {
+  test.setTimeout(45000);
+
   // Generate a random string of 3 characters, skipping the "0." at the beginning
   const randomString = Math.random().toString(36).substring(2, 5);
   // Standard title prefix