fix: preserve contact methods and notes in export/import workflow

- Fix contactMethods not being exported (was checking for string instead of array)
- Add missing notes and iViewContent fields to $insertContact method
- Normalize empty strings to null when saving contacts in ContactEditView

This ensures contact data integrity is maintained during export/import operations.

BUILDING.md

@@ -1156,9 +1156,6 @@ gem_path=$(which gem)
 shortened_path="${gem_path:h:h}"
 export GEM_HOME=$shortened_path
 export GEM_PATH=$shortened_path
-
-cd ios/App
-pod install
 ```
 
 ##### 1. Bump the version in package.json for `MARKETING_VERSION`, then `grep CURRENT_PROJECT_VERSION ios/App/App.xcodeproj/project.pbxproj` and add 1 for the numbered version;

android/app/build.gradle

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

src/components/DataExportSection.vue

@@ -10,7 +10,7 @@ messages * - Conditional UI based on platform capabilities * * @component *
 
 <template>
   <div id="sectionDataExport" :class="containerClasses">
-    <div :class="titleClasses">Data Export</div>
+    <div :class="titleClasses">Data Management</div>
     <router-link
       v-if="activeDid"
       :to="{ name: 'seed-backup' }"
@@ -30,7 +30,7 @@ messages * - Conditional UI based on platform capabilities * * @component *
       :class="exportButtonClasses"
       @click="exportDatabase()"
     >
-      {{ isExporting ? "Exporting..." : "Download Contacts" }}
+      {{ isExporting ? "Exporting..." : "Export Contacts" }}
     </button>
 
     <div
@@ -55,11 +55,54 @@ messages * - Conditional UI based on platform capabilities * * @component *
         </li>
       </ul>
     </div>
+
+    <!-- Import Contacts -->
+    <div id="sectionImportContactsSettings" class="mt-4">
+      <h2 class="text-slate-500 text-sm font-bold">Import Contacts</h2>
+
+      <div class="mt-2">
+        <input
+          type="file"
+          class="w-full bg-white rounded-md pe-2 file:border-0 file:bg-gradient-to-b file:from-blue-400 file:to-blue-700 file:shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] file:text-white file:px-3 file:py-2 file:me-2 file:rounded-s-md"
+          @change="uploadImportFile"
+        />
+        <transition
+          enter-active-class="transform ease-out duration-300 transition"
+          enter-from-class="translate-y-2 opacity-0 sm:translate-y-4"
+          enter-to-class="translate-y-0 opacity-100 sm:translate-y-0"
+          leave-active-class="transition ease-in duration-500"
+          leave-from-class="opacity-100"
+          leave-to-class="opacity-0"
+        >
+          <div v-if="showContactImport()" class="mt-2">
+            <!-- Bulk import has an error
+            <div class="flex justify-center">
+              <button
+                class="block text-center text-md 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-md mb-6"
+                @click="confirmSubmitImportFile()"
+              >
+                Overwrite Settings & Contacts
+                <br />
+                (which doesn't include Identifier Data)
+              </button>
+            </div>
+            -->
+            <button
+              class="block w-full text-center text-md 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-md"
+              @click="checkContactImports()"
+            >
+              Import Contacts
+            </button>
+          </div>
+        </transition>
+      </div>
+    </div>
   </div>
 </template>
 
 <script lang="ts">
 import { Component, Prop, Vue } from "vue-facing-decorator";
+import { Router } from "vue-router";
 import * as R from "ramda";
 
 import { AppString, NotificationIface } from "../constants/app";
@@ -67,8 +110,10 @@ import { Contact } from "../db/tables/contacts";
 
 import { logger } from "../utils/logger";
 import { contactsToExportJson } from "../libs/util";
-import { createNotifyHelpers } from "@/utils/notify";
+import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
 import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
+import { ACCOUNT_VIEW_CONSTANTS } from "@/constants/accountView";
+import { ImportContent } from "@/interfaces/accountView";
 
 /**
  * @vue-component
@@ -91,6 +136,12 @@ export default class DataExportSection extends Vue {
    */
   $notify!: (notification: NotificationIface, timeout?: number) => void;
 
+  /**
+   * Router instance injected by Vue
+   * Used for navigation
+   */
+  $router!: Router;
+
   /**
    * Active DID (Decentralized Identifier) of the user
    * Controls visibility of seed backup option
@@ -110,6 +161,12 @@ export default class DataExportSection extends Vue {
    */
   showRedNotificationDot = false;
 
+  /**
+   * Reference to the selected import file
+   * Used to store the file selected by the user for import
+   */
+  private inputImportFileName: Blob | undefined;
+
   /**
    * Notification helper for consistent notification patterns
    * Created as a getter to ensure $notify is available when called
@@ -200,12 +257,30 @@ export default class DataExportSection extends Vue {
         // first remove the contactMethods field, mostly to cast to a clear type (that will end up with JSON objects)
         const exContact: Contact = R.omit(["contactMethods"], contact);
         // now add contactMethods as a true array of ContactMethod objects
-        exContact.contactMethods = contact.contactMethods
+        // $contacts() returns normalized contacts where contactMethods is already an array,
-          ? typeof contact.contactMethods === "string" &&
+        // but we handle both array and string cases for robustness
-            contact.contactMethods.trim() !== ""
+        if (contact.contactMethods) {
-            ? JSON.parse(contact.contactMethods)
+          if (Array.isArray(contact.contactMethods)) {
-            : []
+            // Already an array, use it directly
-          : [];
+            exContact.contactMethods = contact.contactMethods;
+          } else {
+            // Check if it's a string that needs parsing (shouldn't happen with normalized contacts, but handle for robustness)
+            const contactMethodsValue = contact.contactMethods as unknown;
+            if (
+              typeof contactMethodsValue === "string" &&
+              contactMethodsValue.trim() !== ""
+            ) {
+              // String that needs parsing
+              exContact.contactMethods = JSON.parse(contactMethodsValue);
+            } else {
+              // Invalid data, use empty array
+              exContact.contactMethods = [];
+            }
+          }
+        } else {
+          // No contactMethods, use empty array
+          exContact.contactMethods = [];
+        }
         return exContact;
       });
 
@@ -248,5 +323,58 @@ export default class DataExportSection extends Vue {
       this.showRedNotificationDot = false;
     }
   }
+
+  /**
+   * Handles file selection for contact import
+   * Stores the selected file for later processing
+   */
+  async uploadImportFile(event: Event): Promise<void> {
+    this.inputImportFileName = (event.target as HTMLInputElement).files?.[0];
+  }
+
+  /**
+   * Checks if a contact import file has been selected
+   * Used to conditionally show the import button
+   */
+  showContactImport(): boolean {
+    return !!this.inputImportFileName;
+  }
+
+  /**
+   * Processes the selected import file and navigates to the contact import view
+   * Parses the JSON file and extracts contact data for import
+   */
+  async checkContactImports(): Promise<void> {
+    if (!this.inputImportFileName) {
+      return;
+    }
+
+    const reader = new FileReader();
+    reader.onload = (event) => {
+      const fileContent: string = (event.target?.result as string) || "{}";
+      try {
+        const contents: ImportContent = JSON.parse(fileContent);
+        const contactTableRows: Array<Contact> = (
+          contents.data?.data as [{ tableName: string; rows: Array<Contact> }]
+        )?.find((table) => table.tableName === "contacts")
+          ?.rows as Array<Contact>;
+        const contactRows = contactTableRows.map(
+          // @ts-expect-error for omitting this field that is found in the Dexie format
+          (contact) => R.omit(["$types"], contact) as Contact,
+        );
+        this.$router.push({
+          name: "contact-import",
+          query: { contacts: JSON.stringify(contactRows) },
+        });
+      } catch (error) {
+        logger.error("Error checking contact imports:", error);
+        this.notify.error(
+          ACCOUNT_VIEW_CONSTANTS.ERRORS.IMPORT_ERROR,
+          TIMEOUTS.STANDARD,
+        );
+      }
+    };
+    reader.readAsText(this.inputImportFileName);
+  }
 }
 </script>

src/components/EntityGrid.vue

@@ -76,7 +76,7 @@ projects, and special entities with selection. * * @author Matthew Raymer */
     </template>
 
     <!-- Empty state message -->
-    <li v-if="entities.length === 0" :class="emptyStateClasses">
+    <li v-if="hasNoEntities" :class="emptyStateClasses">
       {{ emptyStateMessage }}
     </li>
 
@@ -108,7 +108,7 @@ projects, and special entities with selection. * * @author Matthew Raymer */
           <li
             class="text-xs font-semibold text-slate-500 uppercase pt-5 pb-1.5 px-2 border-b border-slate-300"
           >
-            Everyone Else
+            Everyone
           </li>
           <PersonCard
             v-for="person in alphabeticalContacts"
@@ -164,6 +164,10 @@ import { Contact } from "../db/tables/contacts";
 import { PlanData } from "../interfaces/records";
 import { NotificationIface } from "../constants/app";
 import { UNNAMED_ENTITY_NAME } from "@/constants/entities";
+import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
+import { getHeaders } from "../libs/endorserServer";
+import { logger } from "../utils/logger";
+import { TIMEOUTS } from "@/utils/notify";
 
 /**
  * Constants for infinite scroll configuration
@@ -191,6 +195,7 @@ const RECENT_CONTACTS_COUNT = 3;
     ProjectCard,
     SpecialEntityCard,
   },
+  mixins: [PlatformServiceMixin],
 })
 export default class EntityGrid extends Vue {
   /** Type of entities to display */
@@ -202,15 +207,36 @@ export default class EntityGrid extends Vue {
   isSearching = false;
   searchTimeout: NodeJS.Timeout | null = null;
   filteredEntities: Contact[] | PlanData[] = [];
+  searchBeforeId: string | undefined = undefined;
+  isLoadingSearchMore = false;
+
+  // API server for project searches
+  apiServer = "";
+
+  // Internal project state (when entities prop not provided for projects)
+  allProjects: PlanData[] = [];
+  loadBeforeId: string | undefined = undefined;
+  isLoadingProjects = false;
 
   // Infinite scroll state
   displayedCount = INITIAL_BATCH_SIZE;
   infiniteScrollReset?: () => void;
   scrollContainer?: HTMLElement;
 
-  /** Array of entities to display */
+  /**
-  @Prop({ required: true })
+   * Array of entities to display
-  entities!: Contact[] | PlanData[];
+   *
+   * For contacts (entityType === 'people'): REQUIRED - Must be a COMPLETE list from local database.
+   * Use $contactsByDateAdded() to ensure all contacts are included.
+   * Client-side filtering assumes the complete list is available.
+   * IMPORTANT: When passing Contact[] arrays, they must be sorted by date added
+   * (newest first) for the "Recently Added" section to display correctly.
+   *
+   * For projects (entityType === 'projects'): OPTIONAL - If not provided, EntityGrid loads
+   * projects internally from the API server. If provided, uses the provided list.
+   */
+  @Prop({ required: false })
+  entities?: Contact[] | PlanData[];
 
   /** Active user's DID */
   @Prop({ required: true })
@@ -282,6 +308,33 @@ export default class EntityGrid extends Vue {
     return "text-xs text-slate-500 italic col-span-full";
   }
 
+  /**
+   * Check if there are no entities to display
+   */
+  get hasNoEntities(): boolean {
+    if (this.entityType === "projects") {
+      // For projects: check internal state if no entities prop, otherwise check prop
+      const projectsToCheck = this.entities || this.allProjects;
+      return projectsToCheck.length === 0;
+    } else {
+      // For people: entities prop is required
+      return !this.entities || this.entities.length === 0;
+    }
+  }
+
+  /**
+   * Get the entities array to use (prop or internal state)
+   */
+  get entitiesToUse(): Contact[] | PlanData[] {
+    if (this.entityType === "projects") {
+      // For projects: use prop if provided, otherwise use internal state
+      return this.entities || this.allProjects;
+    } else {
+      // For people: entities prop is required
+      return this.entities || [];
+    }
+  }
+
   /**
    * Computed entities to display - uses function prop if provided, otherwise uses infinite scroll
    * When searching, returns filtered results with infinite scroll applied
@@ -294,12 +347,12 @@ export default class EntityGrid extends Vue {
 
     // If custom function provided, use it (disables infinite scroll)
     if (this.displayEntitiesFunction) {
-      return this.displayEntitiesFunction(this.entities, this.entityType);
+      return this.displayEntitiesFunction(this.entitiesToUse, this.entityType);
     }
 
     // Default: projects use infinite scroll
     if (this.entityType === "projects") {
-      return (this.entities as PlanData[]).slice(0, this.displayedCount);
+      return (this.entitiesToUse as PlanData[]).slice(0, this.displayedCount);
     }
 
     // People: handled by recentContacts + alphabeticalContacts (both use displayedCount)
@@ -307,14 +360,21 @@ export default class EntityGrid extends Vue {
   }
 
   /**
-   * Get the 3 most recently added contacts (when showing contacts and not searching)
+   * Get the most recently added contacts (when showing contacts and not searching)
+   *
+   * NOTE: This assumes entities are already sorted by date added (newest first).
+   * See the entities prop documentation for details on using $contactsByDateAdded().
    */
   get recentContacts(): Contact[] {
-    if (this.entityType !== "people" || this.searchTerm.trim()) {
+    if (
+      this.entityType !== "people" ||
+      this.searchTerm.trim() ||
+      !this.entities
+    ) {
       return [];
     }
     // Entities are already sorted by date added (newest first)
-    return (this.entities as Contact[]).slice(0, 3);
+    return (this.entities as Contact[]).slice(0, RECENT_CONTACTS_COUNT);
   }
 
   /**
@@ -322,19 +382,23 @@ export default class EntityGrid extends Vue {
    * Uses infinite scroll to control how many are displayed
    */
   get alphabeticalContacts(): Contact[] {
-    if (this.entityType !== "people" || this.searchTerm.trim()) {
+    if (
+      this.entityType !== "people" ||
+      this.searchTerm.trim() ||
+      !this.entities
+    ) {
       return [];
     }
-    // Skip the first 3 (recent contacts) and sort the rest alphabetically
+    // Skip the first few (recent contacts) and sort the rest alphabetically
     // Create a copy to avoid mutating the original array
-    const remaining = (this.entities as Contact[]).slice(RECENT_CONTACTS_COUNT);
+    const remaining = this.entities as Contact[];
     const sorted = [...remaining].sort((a: Contact, b: Contact) => {
       // Sort alphabetically by name, falling back to DID if name is missing
       const nameA = (a.name || a.did).toLowerCase();
       const nameB = (b.name || b.did).toLowerCase();
       return nameA.localeCompare(nameB);
     });
-    // Apply infinite scroll: show based on displayedCount (minus the 3 recent)
+    // Apply infinite scroll: show based on displayedCount (minus the recent contacts)
     const toShow = Math.max(0, this.displayedCount - RECENT_CONTACTS_COUNT);
     return sorted.slice(0, toShow);
   }
@@ -443,47 +507,28 @@ export default class EntityGrid extends Vue {
 
   /**
    * Perform the actual search
+   * Routes to server-side search for projects or client-side filtering for contacts
    */
   async performSearch(): Promise<void> {
     if (!this.searchTerm.trim()) {
       this.filteredEntities = [];
       this.displayedCount = INITIAL_BATCH_SIZE;
+      this.searchBeforeId = undefined;
       this.infiniteScrollReset?.();
       return;
     }
 
     this.isSearching = true;
+    this.searchBeforeId = undefined; // Reset pagination for new search
 
     try {
-      // Simulate async search (in case we need to add API calls later)
+      if (this.entityType === "projects") {
-      await new Promise((resolve) => setTimeout(resolve, 100));
+        // Server-side search for projects (initial load, no beforeId)
-
+        const searchLower = this.searchTerm.toLowerCase().trim();
-      const searchLower = this.searchTerm.toLowerCase().trim();
+        await this.fetchProjects(undefined, searchLower);
-
-      if (this.entityType === "people") {
-        this.filteredEntities = (this.entities as Contact[])
-          .filter((contact: Contact) => {
-            const name = contact.name?.toLowerCase() || "";
-            const did = contact.did.toLowerCase();
-            return name.includes(searchLower) || did.includes(searchLower);
-          })
-          .sort((a: Contact, b: Contact) => {
-            // Sort alphabetically by name, falling back to DID if name is missing
-            const nameA = (a.name || a.did).toLowerCase();
-            const nameB = (b.name || b.did).toLowerCase();
-            return nameA.localeCompare(nameB);
-          });
       } else {
-        this.filteredEntities = (this.entities as PlanData[])
+        // Client-side filtering for contacts (complete list)
-          .filter((project: PlanData) => {
+        await this.performContactSearch();
-            const name = project.name?.toLowerCase() || "";
-            const handleId = project.handleId.toLowerCase();
-            return name.includes(searchLower) || handleId.includes(searchLower);
-          })
-          .sort((a: PlanData, b: PlanData) => {
-            // Sort alphabetically by name
-            return a.name.toLowerCase().localeCompare(b.name.toLowerCase());
-          });
       }
 
       // Reset displayed count when search completes
@@ -494,6 +539,194 @@ export default class EntityGrid extends Vue {
     }
   }
 
+  /**
+   * Fetch projects from API server
+   * Unified method for both loading all projects and searching projects.
+   * If claimContents is provided, performs search and updates filteredEntities.
+   * If claimContents is not provided, loads all projects and updates allProjects.
+   *
+   * @param beforeId - Optional rowId for pagination (loads projects before this ID)
+   * @param claimContents - Optional search term (if provided, performs search; if not, loads all)
+   */
+  async fetchProjects(
+    beforeId?: string,
+    claimContents?: string,
+  ): Promise<void> {
+    if (!this.apiServer) {
+      if (claimContents) {
+        this.filteredEntities = [];
+      } else {
+        this.allProjects = [];
+      }
+      if (this.notify) {
+        this.notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: "API server not configured",
+          },
+          TIMEOUTS.SHORT,
+        );
+      }
+      return;
+    }
+
+    const isSearch = !!claimContents;
+    let url = `${this.apiServer}/api/v2/report/plans`;
+
+    // Build query parameters
+    const params: string[] = [];
+    if (claimContents) {
+      params.push(
+        `claimContents=${encodeURIComponent(claimContents.toLowerCase().trim())}`,
+      );
+    }
+    if (beforeId) {
+      params.push(`beforeId=${encodeURIComponent(beforeId)}`);
+    }
+    if (params.length > 0) {
+      url += `?${params.join("&")}`;
+    }
+
+    try {
+      const response = await fetch(url, {
+        method: "GET",
+        headers: await getHeaders(this.activeDid),
+      });
+
+      if (response.status !== 200) {
+        throw new Error(
+          isSearch ? "Failed to search projects" : "Failed to load projects",
+        );
+      }
+
+      const results = await response.json();
+      if (results.data) {
+        const newProjects = results.data.map(
+          (plan: PlanData & { rowId?: string }) => ({
+            ...plan,
+            rowId: plan.rowId,
+          }),
+        );
+
+        if (isSearch) {
+          // Search mode: update filteredEntities
+          if (beforeId) {
+            // Pagination: append new projects to existing search results
+            this.filteredEntities.push(...newProjects);
+          } else {
+            // Initial search: replace array
+            this.filteredEntities = newProjects;
+          }
+
+          // Update searchBeforeId for next pagination
+          if (newProjects.length > 0) {
+            const lastProject = newProjects[newProjects.length - 1];
+            this.searchBeforeId = lastProject.rowId || undefined;
+          } else {
+            this.searchBeforeId = undefined; // No more results
+          }
+        } else {
+          // Load mode: update allProjects
+          if (beforeId) {
+            // Pagination: append new projects
+            this.allProjects.push(...newProjects);
+          } else {
+            // Initial load: replace array
+            this.allProjects = newProjects;
+          }
+
+          // Update loadBeforeId for next pagination
+          if (newProjects.length > 0) {
+            const lastProject = newProjects[newProjects.length - 1];
+            this.loadBeforeId = lastProject.rowId || undefined;
+          } else {
+            this.loadBeforeId = undefined; // No more results
+          }
+        }
+      } else {
+        // No data in response
+        if (isSearch) {
+          if (!beforeId) {
+            // Only clear on initial search, not pagination
+            this.filteredEntities = [];
+          }
+          this.searchBeforeId = undefined;
+        } else {
+          if (!beforeId) {
+            // Only clear on initial load, not pagination
+            this.allProjects = [];
+          }
+          this.loadBeforeId = undefined;
+        }
+      }
+    } catch (error) {
+      logger.error(
+        `Error ${isSearch ? "searching" : "loading"} projects:`,
+        error,
+      );
+      if (isSearch) {
+        if (!beforeId) {
+          // Only clear on initial search error, not pagination error
+          this.filteredEntities = [];
+        }
+        this.searchBeforeId = undefined;
+      } else {
+        if (!beforeId) {
+          // Only clear on initial load error, not pagination error
+          this.allProjects = [];
+        }
+        this.loadBeforeId = undefined;
+      }
+      if (this.notify) {
+        this.notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: isSearch
+              ? "Failed to search projects. Please try again."
+              : "Failed to load projects. Please try again.",
+          },
+          TIMEOUTS.STANDARD,
+        );
+      }
+    }
+  }
+
+  /**
+   * Client-side contact search
+   * Assumes entities prop contains complete contact list from local database
+   */
+  async performContactSearch(): Promise<void> {
+    if (!this.entities) {
+      this.filteredEntities = [];
+      return;
+    }
+
+    // Simulate async (for consistency with project search)
+    await new Promise((resolve) => setTimeout(resolve, 100));
+
+    const searchLower = this.searchTerm.toLowerCase().trim();
+
+    this.filteredEntities = (this.entities as Contact[])
+      .filter((contact: Contact) => {
+        const name = contact.name?.toLowerCase() || "";
+        const did = contact.did.toLowerCase();
+        return name.includes(searchLower) || did.includes(searchLower);
+      })
+      .sort((a: Contact, b: Contact) => {
+        // Sort alphabetically by name, falling back to DID if name is missing
+        const nameA = (a.name || a.did).toLowerCase();
+        const nameB = (b.name || b.did).toLowerCase();
+        return nameA.localeCompare(nameB);
+      });
+
+    // Contacts don't need pagination (complete list)
+    this.searchBeforeId = undefined;
+  }
+
   /**
    * Clear the search
    */
@@ -502,6 +735,7 @@ export default class EntityGrid extends Vue {
     this.filteredEntities = [];
     this.isSearching = false;
     this.displayedCount = INITIAL_BATCH_SIZE;
+    this.searchBeforeId = undefined;
     this.infiniteScrollReset?.();
 
     // Clear any pending timeout
@@ -521,35 +755,161 @@ export default class EntityGrid extends Vue {
     }
 
     if (this.searchTerm.trim()) {
-      // Search mode: check filtered entities
+      // Search mode: check if more results available
-      return this.displayedCount < this.filteredEntities.length;
+      if (this.entityType === "projects") {
+        // Projects: can load more if:
+        // 1. We have more already-loaded results to show, OR
+        // 2. We've shown all loaded results AND there's a searchBeforeId to load more
+        const hasMoreLoaded =
+          this.displayedCount < this.filteredEntities.length;
+        const canLoadMoreFromServer =
+          this.displayedCount >= this.filteredEntities.length &&
+          !!this.searchBeforeId &&
+          !this.isLoadingSearchMore;
+        return hasMoreLoaded || canLoadMoreFromServer;
+      } else {
+        // Contacts: client-side filtering returns all results at once
+        return this.displayedCount < this.filteredEntities.length;
+      }
     }
 
+    // Non-search mode
     if (this.entityType === "projects") {
-      // Projects: check if more available
+      // Projects: check internal state or prop
-      return this.displayedCount < this.entities.length;
+      const projectsToCheck = this.entities || this.allProjects;
+      const beforeId = this.entities ? undefined : this.loadBeforeId;
+
+      // Can load more if:
+      // 1. We have more already-loaded results to show, OR
+      // 2. We've shown all loaded results AND there's a beforeId to load more (and not using entities prop)
+      const hasMoreLoaded = this.displayedCount < projectsToCheck.length;
+      const canLoadMoreFromServer =
+        !this.entities &&
+        this.displayedCount >= projectsToCheck.length &&
+        !!beforeId &&
+        !this.isLoadingProjects;
+
+      return hasMoreLoaded || canLoadMoreFromServer;
     }
 
     // People: check if more alphabetical contacts available
-    // Total available = 3 recent + all alphabetical
+    // Total available = recent + all alphabetical
-    const remaining = (this.entities as Contact[]).slice(RECENT_CONTACTS_COUNT);
+    if (!this.entities) {
-    const totalAvailable = RECENT_CONTACTS_COUNT + remaining.length;
+      return false;
+    }
+    const totalAvailable = RECENT_CONTACTS_COUNT + this.entities.length;
     return this.displayedCount < totalAvailable;
   }
 
   /**
    * Initialize infinite scroll on mount
    */
-  mounted(): void {
+  async mounted(): Promise<void> {
+    // Load apiServer for project searches/loads
+    if (this.entityType === "projects") {
+      const settings = await this.$accountSettings();
+      this.apiServer = settings.apiServer || "";
+
+      // Load projects on mount if entities prop not provided
+      if (!this.entities && this.apiServer) {
+        this.isLoadingProjects = true;
+        try {
+          await this.fetchProjects();
+        } catch (error) {
+          logger.error("Error loading projects on mount:", error);
+        } finally {
+          this.isLoadingProjects = false;
+        }
+      }
+    }
+
+    // Validate entities prop for people
+    if (this.entityType === "people" && !this.entities) {
+      logger.error(
+        "EntityGrid: entities prop is required when entityType is 'people'",
+      );
+      if (this.notify) {
+        this.notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: "Contacts data is required but not provided.",
+          },
+          TIMEOUTS.SHORT,
+        );
+      }
+    }
+
     this.$nextTick(() => {
       const container = this.$refs.scrollContainer as HTMLElement;
 
       if (container) {
         const { reset } = useInfiniteScroll(
           container,
-          () => {
+          async () => {
-            // Load more: increment displayedCount
+            // Search mode: handle search pagination
-            this.displayedCount += INCREMENT_SIZE;
+            if (this.searchTerm.trim()) {
+              if (this.entityType === "projects") {
+                // Projects: load more search results if available
+                if (
+                  this.displayedCount >= this.filteredEntities.length &&
+                  this.searchBeforeId &&
+                  !this.isLoadingSearchMore
+                ) {
+                  this.isLoadingSearchMore = true;
+                  try {
+                    const searchLower = this.searchTerm.toLowerCase().trim();
+                    await this.fetchProjects(this.searchBeforeId, searchLower);
+                    // After loading more, reset scroll state to allow further loading
+                    this.infiniteScrollReset?.();
+                  } catch (error) {
+                    logger.error("Error loading more search results:", error);
+                    // Error already handled in fetchProjects
+                  } finally {
+                    this.isLoadingSearchMore = false;
+                  }
+                } else {
+                  // Show more from already-loaded search results
+                  this.displayedCount += INCREMENT_SIZE;
+                }
+              } else {
+                // Contacts: show more from already-filtered results
+                this.displayedCount += INCREMENT_SIZE;
+              }
+            } else {
+              // Non-search mode
+              if (this.entityType === "projects") {
+                const projectsToCheck = this.entities || this.allProjects;
+                const beforeId = this.entities ? undefined : this.loadBeforeId;
+
+                // If using internal state and need to load more from server
+                if (
+                  !this.entities &&
+                  this.displayedCount >= projectsToCheck.length &&
+                  beforeId &&
+                  !this.isLoadingProjects
+                ) {
+                  this.isLoadingProjects = true;
+                  try {
+                    await this.fetchProjects(beforeId);
+                    // After loading more, reset scroll state to allow further loading
+                    this.infiniteScrollReset?.();
+                  } catch (error) {
+                    logger.error("Error loading more projects:", error);
+                    // Error already handled in fetchProjects
+                  } finally {
+                    this.isLoadingProjects = false;
+                  }
+                } else {
+                  // Normal case: increment displayedCount to show more from memory
+                  this.displayedCount += INCREMENT_SIZE;
+                }
+              } else {
+                // People: increment displayedCount to show more from memory
+                this.displayedCount += INCREMENT_SIZE;
+              }
+            }
           },
           {
             distance: 50, // pixels from bottom
@@ -575,21 +935,35 @@ export default class EntityGrid extends Vue {
   }
 
   /**
-   * Watch for changes in search term to reset displayed count
+   * Watch for changes in search term to reset displayed count and pagination
    */
   @Watch("searchTerm")
   onSearchTermChange(): void {
+    // Reset displayed count and pagination when search term changes
     this.displayedCount = INITIAL_BATCH_SIZE;
+    this.searchBeforeId = undefined;
     this.infiniteScrollReset?.();
   }
 
   /**
-   * Watch for changes in entities prop to reset displayed count
+   * Watch for changes in entities prop to clear search and reset displayed count
    */
   @Watch("entities")
   onEntitiesChange(): void {
+    // Clear search when entities change (fresh dialog open)
+    if (this.searchTerm) {
+      this.searchTerm = "";
+      this.filteredEntities = [];
+      this.searchBeforeId = undefined;
+    }
     this.displayedCount = INITIAL_BATCH_SIZE;
     this.infiniteScrollReset?.();
+
+    // For projects: if entities prop is provided, clear internal state
+    if (this.entityType === "projects" && this.entities) {
+      this.allProjects = [];
+      this.loadBeforeId = undefined;
+    }
   }
 
   /**

src/components/EntitySelectionStep.vue

@@ -14,7 +14,7 @@ properties * * @author Matthew Raymer */
 
     <EntityGrid
       :entity-type="shouldShowProjects ? 'projects' : 'people'"
-      :entities="shouldShowProjects ? projects : allContacts"
+      :entities="shouldShowProjects ? projects || undefined : allContacts"
       :active-did="activeDid"
       :all-my-dids="allMyDids"
       :all-contacts="allContacts"
@@ -94,9 +94,9 @@ export default class EntitySelectionStep extends Vue {
   @Prop({ default: false })
   isFromProjectView!: boolean;
 
-  /** Array of available projects */
+  /** Array of available projects (optional - EntityGrid loads internally if not provided) */
-  @Prop({ required: true })
+  @Prop({ required: false })
-  projects!: PlanData[];
+  projects?: PlanData[];
 
   /** Array of available contacts */
   @Prop({ required: true })

src/components/GiftedDialog.vue

@@ -15,7 +15,6 @@
           giverEntityType === 'project' || recipientEntityType === 'project'
         "
         :is-from-project-view="isFromProjectView"
-        :projects="projects"
         :all-contacts="allContacts"
         :active-did="activeDid"
         :all-my-dids="allMyDids"
@@ -68,7 +67,6 @@ import {
   createAndSubmitGive,
   didInfo,
   serverMessageForUser,
-  getHeaders,
 } from "../libs/endorserServer";
 import * as libsUtil from "../libs/util";
 import { Contact } from "../db/tables/contacts";
@@ -134,7 +132,6 @@ export default class GiftedDialog extends Vue {
   firstStep = true; // true = Step 1 (giver/recipient selection), false = Step 2 (amount/description)
   giver?: libsUtil.GiverReceiverInputInfo; // undefined means no identified giver agent
   offerId = "";
-  projects: PlanData[] = [];
   prompt = "";
   receiver?: libsUtil.GiverReceiverInputInfo;
   stepType = "giver";
@@ -234,16 +231,6 @@ export default class GiftedDialog extends Vue {
       this.allContacts = await this.$contactsByDateAdded();
 
       this.allMyDids = await retrieveAccountDids();
-
-      if (
-        this.giverEntityType === "project" ||
-        this.recipientEntityType === "project"
-      ) {
-        await this.loadProjects();
-      } else {
-        // Clear projects array when not needed
-        this.projects = [];
-      }
     } catch (err: unknown) {
       logger.error("Error retrieving settings from database:", err);
       this.safeNotify.error(
@@ -489,27 +476,6 @@ export default class GiftedDialog extends Vue {
     this.firstStep = false;
   }
 
-  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.safeNotify.error("Failed to load projects", TIMEOUTS.STANDARD);
-    }
-  }
-
   selectProject(project: PlanData) {
     this.giver = {
       did: project.handleId,

src/components/MeetingProjectDialog.vue

@@ -0,0 +1,130 @@
+<template>
+  <div v-if="visible" class="dialog-overlay">
+    <div class="dialog">
+      <!-- Header -->
+      <h2 class="text-lg font-semibold leading-[1.25] mb-4">Select Project</h2>
+
+      <!-- EntityGrid for projects -->
+      <EntityGrid
+        :entity-type="'projects'"
+        :active-did="activeDid"
+        :all-my-dids="allMyDids"
+        :all-contacts="allContacts"
+        :conflict-checker="() => false"
+        :show-you-entity="false"
+        :show-unnamed-entity="false"
+        :notify="notify"
+        :conflict-context="'project'"
+        @entity-selected="handleEntitySelected"
+      />
+
+      <!-- Cancel Button -->
+      <div class="flex gap-2 mt-4">
+        <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-2 py-2 rounded-md"
+          @click="handleCancel"
+        >
+          Cancel
+        </button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue, Emit } from "vue-facing-decorator";
+import EntityGrid from "./EntityGrid.vue";
+import { Contact } from "../db/tables/contacts";
+import { PlanData } from "../interfaces/records";
+import { NotificationIface } from "../constants/app";
+
+/**
+ * MeetingProjectDialog - Dialog for selecting a project link for a meeting
+ *
+ * Features:
+ * - EntityGrid integration for project selection
+ * - No special entities (You, Unnamed)
+ * - Immediate assignment on project selection
+ * - Cancel button to close without selection
+ */
+@Component({
+  components: {
+    EntityGrid,
+  },
+})
+export default class MeetingProjectDialog extends Vue {
+  /** Whether the dialog is visible */
+  visible = false;
+
+  /** Active user's DID */
+  @Prop({ required: true })
+  activeDid!: string;
+
+  /** All user's DIDs */
+  @Prop({ required: true })
+  allMyDids!: string[];
+
+  /** All contacts */
+  @Prop({ required: true })
+  allContacts!: Contact[];
+
+  /** Notification function from parent component */
+  @Prop()
+  notify?: (notification: NotificationIface, timeout?: number) => void;
+
+  /**
+   * Handle entity selection from EntityGrid
+   * Immediately assigns the selected project and closes the dialog
+   */
+  handleEntitySelected(event: {
+    type: "person" | "project";
+    data: Contact | PlanData;
+  }) {
+    const project = event.data as PlanData;
+    this.emitAssign(project);
+    this.close();
+  }
+
+  /**
+   * Handle cancel button click
+   */
+  handleCancel(): void {
+    this.close();
+  }
+
+  /**
+   * Open the dialog
+   */
+  open(): void {
+    this.visible = true;
+    this.emitOpen();
+  }
+
+  /**
+   * Close the dialog
+   */
+  close(): void {
+    this.visible = false;
+    this.emitClose();
+  }
+
+  // Emit methods using @Emit decorator
+
+  @Emit("assign")
+  emitAssign(project: PlanData): PlanData {
+    return project;
+  }
+
+  @Emit("open")
+  emitOpen(): void {
+    // Emit when dialog opens
+  }
+
+  @Emit("close")
+  emitClose(): void {
+    // Emit when dialog closes
+  }
+}
+</script>
+
+<style scoped></style>

src/components/ProjectCard.vue

@@ -8,7 +8,7 @@ issuer information. * * @author Matthew Raymer */
   >
     <ProjectIcon
       :entity-id="project.handleId"
-      :icon-size="48"
+      :icon-size="30"
       :image-url="project.image"
       class="!size-[2rem] shrink-0 border border-slate-300 bg-white overflow-hidden rounded-full"
     />

src/components/ProjectRepresentativeDialog.vue

@@ -0,0 +1,117 @@
+<template>
+  <div v-if="visible" class="dialog-overlay">
+    <div class="dialog">
+      <!-- Header -->
+      <h2 class="text-lg font-semibold leading-[1.25] mb-4">
+        Select Representative
+      </h2>
+
+      <!-- EntityGrid for contacts -->
+      <EntityGrid
+        :entity-type="'people'"
+        :entities="allContacts"
+        :active-did="activeDid"
+        :all-my-dids="allMyDids"
+        :all-contacts="allContacts"
+        :conflict-checker="() => false"
+        :show-you-entity="false"
+        :show-unnamed-entity="false"
+        :notify="notify"
+        :conflict-context="'representative'"
+        @entity-selected="handleEntitySelected"
+      />
+
+      <!-- Cancel Button -->
+      <div class="flex gap-2 mt-4">
+        <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-2 py-2 rounded-md"
+          @click="handleCancel"
+        >
+          Cancel
+        </button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue, Emit } from "vue-facing-decorator";
+import EntityGrid from "./EntityGrid.vue";
+import { Contact } from "../db/tables/contacts";
+import { NotificationIface } from "../constants/app";
+
+/**
+ * ProjectRepresentativeDialog - Dialog for selecting an authorized representative
+ *
+ * Features:
+ * - EntityGrid integration for contact selection
+ * - No special entities (You, Unnamed)
+ * - Immediate assignment on contact selection
+ * - Cancel button to close without selection
+ */
+@Component({
+  components: {
+    EntityGrid,
+  },
+})
+export default class ProjectRepresentativeDialog extends Vue {
+  /** Whether the dialog is visible */
+  visible = false;
+
+  /** Array of available contacts */
+  @Prop({ required: true })
+  allContacts!: Contact[];
+
+  /** Active user's DID */
+  @Prop({ required: true })
+  activeDid!: string;
+
+  /** All user's DIDs */
+  @Prop({ required: true })
+  allMyDids!: string[];
+
+  /** Notification function from parent component */
+  @Prop()
+  notify?: (notification: NotificationIface, timeout?: number) => void;
+
+  /**
+   * Handle entity selection from EntityGrid
+   * Immediately assigns the selected contact and closes the dialog
+   */
+  handleEntitySelected(event: { type: "person" | "project"; data: Contact }) {
+    const contact = event.data as Contact;
+    this.emitAssign(contact);
+    this.close();
+  }
+
+  /**
+   * Handle cancel button click
+   */
+  handleCancel(): void {
+    this.close();
+  }
+
+  /**
+   * Open the dialog
+   */
+  open(): void {
+    this.visible = true;
+  }
+
+  /**
+   * Close the dialog
+   */
+  close(): void {
+    this.visible = false;
+  }
+
+  // Emit methods using @Emit decorator
+
+  @Emit("assign")
+  emitAssign(contact: Contact): Contact {
+    return contact;
+  }
+}
+</script>
+
+<style scoped></style>

src/interfaces/records.ts

@@ -57,7 +57,12 @@ export interface OfferToPlanSummaryRecord extends OfferSummaryRecord {
   planName: string;
 }
 
-// a summary record; the VC is not currently part of this record
+/**
+ * A summary record
+ * The VC is not currently part of this record.
+ *
+ * If you change this, you may want to update NewActivityView.vue to handle differences correctly.
+ */
 export interface PlanSummaryRecord {
   agentDid?: string;
   description: string;
@@ -76,7 +81,9 @@ export interface PlanSummaryRecord {
 
 export interface PlanSummaryAndPreviousClaim {
   plan: PlanSummaryRecord;
-  wrappedClaimBefore: GenericCredWrapper<PlanActionClaim>;
+  // This can be undefined, eg. if a project is starred after the stored last-seen-change-jwt ID.
+  // The endorser-ch test code shows some cases.
+  wrappedClaimBefore?: GenericCredWrapper<PlanActionClaim>;
 }
 
 /**

src/services/AbsurdSqlDatabaseService.ts

@@ -21,8 +21,14 @@ import IndexedDBBackend from "absurd-sql/dist/indexeddb-backend";
 import { runMigrations } from "../db-sql/migration";
 import type { DatabaseService, QueryExecResult } from "../interfaces/database";
 import { logger } from "@/utils/logger";
-import { OperationQueue, QueueExecutor } from "./platforms/OperationQueue";
+
-import { QueuedOperation } from "./platforms/types";
+interface QueuedOperation {
+  type: "run" | "query";
+  sql: string;
+  params: unknown[];
+  resolve: (value: unknown) => void;
+  reject: (reason: unknown) => void;
+}
 
 interface AbsurdSqlDatabase {
   exec: (sql: string, params?: unknown[]) => Promise<QueryExecResult[]>;
@@ -37,7 +43,8 @@ class AbsurdSqlDatabaseService implements DatabaseService {
   private db: AbsurdSqlDatabase | null;
   private initialized: boolean;
   private initializationPromise: Promise<void> | null = null;
-  private operationQueue = new OperationQueue<AbsurdSqlDatabase>();
+  private operationQueue: Array<QueuedOperation> = [];
+  private isProcessingQueue: boolean = false;
 
   private constructor() {
     this.db = null;
@@ -154,30 +161,42 @@ class AbsurdSqlDatabaseService implements DatabaseService {
     this.processQueue();
   }
 
-  /**
-   * Create executor adapter for AbsurdSQL API
-   */
-  private createExecutor(): QueueExecutor<AbsurdSqlDatabase> {
-    return {
-      executeRun: async (db, sql, params) => {
-        return await db.run(sql, params);
-      },
-      executeQuery: async (db, sql, params) => {
-        return await db.exec(sql, params);
-      },
-    };
-  }
-
   private async processQueue(): Promise<void> {
-    if (!this.initialized || !this.db) {
+    if (this.isProcessingQueue || !this.initialized || !this.db) {
       return;
     }
 
-    await this.operationQueue.processQueue(
+    this.isProcessingQueue = true;
-      this.db,
+
-      this.createExecutor(),
+    while (this.operationQueue.length > 0) {
-      "AbsurdSqlDatabaseService",
+      const operation = this.operationQueue.shift();
-    );
+      if (!operation) continue;
+
+      try {
+        let result: unknown;
+        switch (operation.type) {
+          case "run":
+            result = await this.db.run(operation.sql, operation.params);
+            break;
+          case "query":
+            result = await this.db.exec(operation.sql, operation.params);
+            break;
+        }
+        operation.resolve(result);
+      } catch (error) {
+        logger.error(
+          "Error while processing SQL queue:",
+          error,
+          " ... for sql:",
+          operation.sql,
+          " ... with params:",
+          operation.params,
+        );
+        operation.reject(error);
+      }
+    }
+
+    this.isProcessingQueue = false;
   }
 
   private async queueOperation<R>(
@@ -185,24 +204,21 @@ class AbsurdSqlDatabaseService implements DatabaseService {
     sql: string,
     params: unknown[] = [],
   ): Promise<R> {
-    const operation: QueuedOperation = {
+    return new Promise<R>((resolve, reject) => {
-      type,
+      const operation: QueuedOperation = {
-      sql,
+        type,
-      params,
+        sql,
-      resolve: (_value: unknown) => {
+        params,
-        // No-op, will be wrapped by OperationQueue
+        resolve: (value: unknown) => resolve(value as R),
-      },
+        reject,
-      reject: () => {
+      };
-        // No-op, will be wrapped by OperationQueue
+      this.operationQueue.push(operation);
-      },
-    };
 
-    return this.operationQueue.queueOperation<R>(
+      // If we're already initialized, start processing the queue
-      operation,
+      if (this.initialized && this.db) {
-      this.initialized,
+        this.processQueue();
-      this.db,
+      }
-      () => this.processQueue(),
+    });
-    );
   }
 
   private async waitForInitialization(): Promise<void> {

src/services/PlatformServiceFactory.ts

@@ -4,144 +4,76 @@ import { CapacitorPlatformService } from "./platforms/CapacitorPlatformService";
 import { ElectronPlatformService } from "./platforms/ElectronPlatformService";
 
 /**
- * HMR-safe global singleton storage for PlatformService
+ * Factory class for creating platform-specific service implementations.
+ * Implements the Singleton pattern to ensure only one instance of PlatformService exists.
  *
- * Uses multiple fallbacks to ensure persistence across module reloads:
+ * The factory determines which platform implementation to use based on the VITE_PLATFORM
- * 1. globalThis (standard, works in most environments)
+ * environment variable. Supported platforms are:
- * 2. window (browser fallback)
+ * - capacitor: Mobile platform using Capacitor
- * 3. self (web worker fallback)
+ * - electron: Desktop platform using Electron with Capacitor
- */
+ * - web: Default web platform (fallback)
-declare global {
-  // eslint-disable-next-line no-var
-  var __PLATFORM_SERVICE_SINGLETON__: PlatformService | undefined;
-}
-
-/**
- * Get the global object for singleton storage
- * Uses multiple fallbacks to ensure compatibility
- */
-function getGlobal(): typeof globalThis {
-  if (typeof globalThis !== "undefined") return globalThis;
-  if (typeof window !== "undefined") return window as typeof globalThis;
-  if (typeof self !== "undefined") return self as typeof globalThis;
-  // Fallback for Node.js environments
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  return {} as any;
-}
-
-/**
- * Factory function to create platform-specific service implementation
- *
- * Uses console.log instead of logger to avoid circular dependency
- * (logger imports PlatformServiceFactory)
- */
-function create(): PlatformService {
-  const which = import.meta.env?.VITE_PLATFORM ?? "web";
-
-  if (which === "capacitor") return new CapacitorPlatformService();
-  if (which === "electron") return new ElectronPlatformService();
-  return new WebPlatformService();
-}
-
-/**
- * Get or create the HMR-safe singleton instance of PlatformService
- *
- * Uses lazy initialization to avoid circular dependency issues at module load time.
- */
-function getPlatformSvc(): PlatformService {
-  const global = getGlobal();
-
-  const exists = global.__PLATFORM_SERVICE_SINGLETON__ !== undefined;
-
-  if (!exists) {
-    global.__PLATFORM_SERVICE_SINGLETON__ = create();
-    // Verify it was stored
-    if (!global.__PLATFORM_SERVICE_SINGLETON__) {
-      // eslint-disable-next-line no-console
-      console.error(
-        "[PlatformServiceFactory] ERROR: Singleton creation failed - storage returned undefined",
-      );
-    }
-  }
-
-  // Type guard: ensure singleton exists (should never be undefined at this point)
-  const singleton = global.__PLATFORM_SERVICE_SINGLETON__;
-  if (!singleton) {
-    // eslint-disable-next-line no-console
-    console.error(
-      "[PlatformServiceFactory] CRITICAL: Singleton is undefined after creation/retrieval",
-    );
-    // Fallback: create a new one
-    global.__PLATFORM_SERVICE_SINGLETON__ = create();
-    return global.__PLATFORM_SERVICE_SINGLETON__;
-  }
-
-  return singleton;
-}
-
-/**
- * HMR-safe singleton instance of PlatformService
- *
- * This is the ONLY way to access PlatformService throughout the application.
- * Do not create new instances of platform services directly.
- *
- * Uses lazy initialization via Proxy to avoid circular dependency issues at module load time.
  *
  * @example
  * ```typescript
- * import { PlatformSvc } from "./services/PlatformServiceFactory";
+ * const platformService = PlatformServiceFactory.getInstance();
- * await PlatformSvc.takePicture();
+ * await platformService.takePicture();
  * ```
  */
-export const PlatformSvc = new Proxy({} as PlatformService, {
-  get(_target, prop) {
-    const svc = getPlatformSvc();
-    const value = (svc as unknown as Record<string, unknown>)[prop as string];
-    // Bind methods to maintain 'this' context
-    if (typeof value === "function") {
-      return value.bind(svc);
-    }
-    return value;
-  },
-});
-
-// Preserve singleton across Vite HMR
-if (import.meta?.hot) {
-  import.meta.hot.accept(() => {
-    // Don't recreate on HMR - keep existing instance
-    const global = getGlobal();
-    if (!global.__PLATFORM_SERVICE_SINGLETON__) {
-      // Restore singleton if it was lost during HMR
-      global.__PLATFORM_SERVICE_SINGLETON__ = getPlatformSvc();
-    }
-  });
-  import.meta.hot.dispose(() => {
-    // Don't delete - keep the global instance
-    // The singleton will persist in globalThis/window/self
-  });
-}
-
-/**
- * Legacy factory class for backward compatibility
- * @deprecated Use `PlatformSvc` directly instead
- */
 export class PlatformServiceFactory {
+  private static instance: PlatformService | null = null;
+  private static callCount = 0; // Debug counter
+  private static creationLogged = false; // Only log creation once
+
   /**
-   * Gets the singleton instance of PlatformService.
+   * Gets or creates the singleton instance of PlatformService.
-   * @deprecated Use `PlatformSvc` directly instead
+   * Creates the appropriate platform-specific implementation based on environment.
+   *
+   * @returns {PlatformService} The singleton instance of PlatformService
    */
   public static getInstance(): PlatformService {
-    return PlatformSvc;
+    PlatformServiceFactory.callCount++;
+
+    if (PlatformServiceFactory.instance) {
+      // Normal case - return existing instance silently
+      return PlatformServiceFactory.instance;
+    }
+
+    // Only log when actually creating the instance
+    const platform = process.env.VITE_PLATFORM || "web";
+
+    if (!PlatformServiceFactory.creationLogged) {
+      // Use console for critical startup message to avoid circular dependency
+      // eslint-disable-next-line no-console
+      console.log(
+        `[PlatformServiceFactory] Creating singleton instance for platform: ${platform}`,
+      );
+      PlatformServiceFactory.creationLogged = true;
+    }
+
+    switch (platform) {
+      case "capacitor":
+        PlatformServiceFactory.instance = new CapacitorPlatformService();
+        break;
+      case "electron":
+        // Use a specialized electron service that extends CapacitorPlatformService
+        PlatformServiceFactory.instance = new ElectronPlatformService();
+        break;
+      case "web":
+      default:
+        PlatformServiceFactory.instance = new WebPlatformService();
+        break;
+    }
+
+    return PlatformServiceFactory.instance;
   }
 
   /**
    * Debug method to check singleton usage stats
    */
   public static getStats(): { callCount: number; instanceExists: boolean } {
-    const global = getGlobal();
     return {
-      callCount: 0, // Deprecated - no longer tracking
+      callCount: PlatformServiceFactory.callCount,
-      instanceExists: global.__PLATFORM_SERVICE_SINGLETON__ !== undefined,
+      instanceExists: PlatformServiceFactory.instance !== null,
     };
   }
 }

src/services/platforms/OperationQueue.ts

@@ -1,135 +0,0 @@
-/**
- * Shared operation queue handler for database services
- *
- * Provides a reusable queue mechanism for database operations that need to
- * wait for initialization before execution.
- */
-
-import { QueuedOperation } from "./types";
-import { logger } from "../../utils/logger";
-
-export interface QueueExecutor<TDb> {
-  executeRun(db: TDb, sql: string, params: unknown[]): Promise<unknown>;
-  executeQuery(db: TDb, sql: string, params: unknown[]): Promise<unknown>;
-  executeRawQuery?(db: TDb, sql: string, params: unknown[]): Promise<unknown>;
-}
-
-export class OperationQueue<TDb> {
-  private operationQueue: Array<QueuedOperation> = [];
-  private isProcessingQueue: boolean = false;
-
-  /**
-   * Process queued operations
-   */
-  async processQueue(
-    db: TDb,
-    executor: QueueExecutor<TDb>,
-    serviceName: string,
-  ): Promise<void> {
-    if (this.isProcessingQueue || !db) {
-      return;
-    }
-
-    this.isProcessingQueue = true;
-
-    while (this.operationQueue.length > 0) {
-      const operation = this.operationQueue.shift();
-      if (!operation) continue;
-
-      try {
-        let result: unknown;
-        switch (operation.type) {
-          case "run":
-            result = await executor.executeRun(
-              db,
-              operation.sql,
-              operation.params,
-            );
-            break;
-          case "query":
-            result = await executor.executeQuery(
-              db,
-              operation.sql,
-              operation.params,
-            );
-            break;
-          case "rawQuery":
-            if (executor.executeRawQuery) {
-              result = await executor.executeRawQuery(
-                db,
-                operation.sql,
-                operation.params,
-              );
-            } else {
-              // Fallback to query if rawQuery not supported
-              result = await executor.executeQuery(
-                db,
-                operation.sql,
-                operation.params,
-              );
-            }
-            break;
-        }
-        operation.resolve(result);
-      } catch (error) {
-        logger.error(
-          `[${serviceName}] Error while processing SQL queue:`,
-          error,
-        );
-        logger.error(
-          `[${serviceName}] Failed operation - Type: ${operation.type}, SQL: ${operation.sql}`,
-        );
-        logger.error(
-          `[${serviceName}] Failed operation - Params:`,
-          operation.params,
-        );
-        operation.reject(error);
-      }
-    }
-
-    this.isProcessingQueue = false;
-  }
-
-  /**
-   * Queue an operation for later execution
-   *
-   * @param operation - Pre-constructed operation object (allows platform-specific parameter conversion)
-   * @param initialized - Whether the database is initialized
-   * @param db - Database connection (if available)
-   * @param onQueue - Callback to trigger queue processing
-   */
-  queueOperation<R>(
-    operation: QueuedOperation,
-    initialized: boolean,
-    db: TDb | null,
-    onQueue: () => void,
-  ): Promise<R> {
-    return new Promise<R>((resolve, reject) => {
-      // Wrap the operation's resolve/reject to match our Promise
-      const wrappedOperation: QueuedOperation = {
-        ...operation,
-        resolve: (value: unknown) => {
-          operation.resolve(value);
-          resolve(value as R);
-        },
-        reject: (reason: unknown) => {
-          operation.reject(reason);
-          reject(reason);
-        },
-      };
-      this.operationQueue.push(wrappedOperation);
-
-      // If already initialized, trigger queue processing
-      if (initialized && db) {
-        onQueue();
-      }
-    });
-  }
-
-  /**
-   * Get current queue length (for debugging)
-   */
-  getQueueLength(): number {
-    return this.operationQueue.length;
-  }
-}

src/services/platforms/sqlite.ts

@@ -1,20 +0,0 @@
-/**
- * Shared SQLite connection manager for Capacitor platform
- *
- * Ensures only one SQLiteConnection instance exists across the application,
- * preventing connection desync issues and unnecessary connection recreation.
- */
-
-import { CapacitorSQLite, SQLiteConnection } from "@capacitor-community/sqlite";
-
-/**
- * Native Capacitor SQLite plugin instance
- * This is the bridge to the native SQLite implementation
- */
-export const CAP_SQLITE = CapacitorSQLite;
-
-/**
- * Shared SQLite connection manager
- * Use this instance throughout the application - do not create new SQLiteConnection instances
- */
-export const SQLITE = new SQLiteConnection(CAP_SQLITE);

src/services/platforms/types.ts

@@ -1,13 +0,0 @@
-/**
- * Types for platform services
- */
-
-export interface QueuedOperation {
-  type: "run" | "query" | "rawQuery";
-  sql: string;
-  params: unknown[];
-  resolve: (value: unknown) => void;
-  reject: (reason: unknown) => void;
-}
-
-export type QueuedOperationType = QueuedOperation["type"];

src/utils/PlatformServiceMixin.ts

@@ -1367,6 +1367,9 @@ export const PlatformServiceMixin = {
             contact.profileImageUrl !== undefined
               ? contact.profileImageUrl
               : null,
+          notes: contact.notes !== undefined ? contact.notes : null,
+          iViewContent:
+            contact.iViewContent !== undefined ? contact.iViewContent : null,
           contactMethods:
             contact.contactMethods !== undefined
               ? Array.isArray(contact.contactMethods)
@@ -1377,8 +1380,8 @@ export const PlatformServiceMixin = {
 
         await this.$dbExec(
           `INSERT OR REPLACE INTO contacts 
-           (did, name, publicKeyBase64, seesMe, registered, nextPubKeyHashB64, profileImageUrl, contactMethods) 
+           (did, name, publicKeyBase64, seesMe, registered, nextPubKeyHashB64, profileImageUrl, notes, iViewContent, contactMethods) 
-           VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
+           VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
           [
             safeContact.did,
             safeContact.name,
@@ -1387,6 +1390,8 @@ export const PlatformServiceMixin = {
             safeContact.registered,
             safeContact.nextPubKeyHashB64,
             safeContact.profileImageUrl,
+            safeContact.notes,
+            safeContact.iViewContent,
             safeContact.contactMethods,
           ],
         );

src/utils/seedPhraseReminder.ts

@@ -1,5 +1,4 @@
 import { NotificationIface } from "@/constants/app";
-import router from "@/router";
 
 const SEED_REMINDER_KEY = "seedPhraseReminderLastShown";
 const REMINDER_COOLDOWN_MS = 24 * 60 * 60 * 1000; // 24 hours in milliseconds
@@ -54,8 +53,8 @@ export function createSeedReminderNotification(): NotificationIface {
     yesText: "Backup Identifier Seed",
     noText: "Remind me Later",
     onYes: async () => {
-      // Navigate to seed backup page using SPA routing
+      // Navigate to seed backup page
-      await router.push({ path: "/seed-backup" });
+      window.location.href = "/seed-backup";
     },
     onNo: async () => {
       // Mark as shown so it won't appear again for 24 hours

src/views/AccountViewView.vue

@@ -375,45 +375,6 @@
         Switch Identifier
       </router-link>
 
-      <div id="sectionImportContactsSettings" class="mt-4">
-        <h2 class="text-slate-500 text-sm font-bold">Import Contacts</h2>
-
-        <div class="ml-4 mt-2">
-          <input type="file" class="ml-2" @change="uploadImportFile" />
-          <transition
-            enter-active-class="transform ease-out duration-300 transition"
-            enter-from-class="translate-y-2 opacity-0 sm:translate-y-4"
-            enter-to-class="translate-y-0 opacity-100 sm:translate-y-0"
-            leave-active-class="transition ease-in duration-500"
-            leave-from-class="opacity-100"
-            leave-to-class="opacity-0"
-          >
-            <div v-if="showContactImport()" class="mt-4">
-              <!-- Bulk import has an error
-              <div class="flex justify-center">
-                <button
-                  class="block text-center text-md 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-md mb-6"
-                  @click="confirmSubmitImportFile()"
-                >
-                  Overwrite Settings & Contacts
-                  <br />
-                  (which doesn't include Identifier Data)
-                </button>
-              </div>
-              -->
-              <div class="flex justify-center">
-                <button
-                  class="block text-center text-md 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-md mb-6"
-                  @click="checkContactImports()"
-                >
-                  Import Contacts
-                </button>
-              </div>
-            </div>
-          </transition>
-        </div>
-      </div>
-
       <label
         for="toggleShowAmounts"
         class="flex items-center justify-between cursor-pointer my-4"
@@ -770,9 +731,7 @@ import "dexie-export-import";
 import { ImportProgress } from "dexie-export-import";
 import { LeafletMouseEvent } from "leaflet";
 import * as L from "leaflet";
-import * as R from "ramda";
 import { IIdentifier } from "@veramo/core";
-import { ref } from "vue";
 import { Component, Vue } from "vue-facing-decorator";
 import { RouteLocationNormalizedLoaded, Router } from "vue-router";
 import { copyToClipboard } from "../services/ClipboardService";
@@ -799,7 +758,6 @@ import {
   NotificationIface,
   PASSKEYS_ENABLED,
 } from "../constants/app";
-import { Contact } from "../db/tables/contacts";
 import {
   DEFAULT_PASSKEY_EXPIRATION_MINUTES,
   BoundingBox,
@@ -823,11 +781,7 @@ import { PlatformServiceMixin } from "../utils/PlatformServiceMixin";
 import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
 import { ACCOUNT_VIEW_CONSTANTS } from "@/constants/accountView";
 import { showSeedPhraseReminder } from "@/utils/seedPhraseReminder";
-import {
+import { AccountSettings, isApiError } from "@/interfaces/accountView";
-  AccountSettings,
-  isApiError,
-  ImportContent,
-} from "@/interfaces/accountView";
 // Profile data interface (inlined from ProfileService)
 interface ProfileData {
   description: string;
@@ -836,8 +790,6 @@ interface ProfileData {
   includeLocation: boolean;
 }
 
-const inputImportFileNameRef = ref<Blob>();
-
 interface UserNameDialogRef {
   open: (cb: (name?: string) => void) => void;
 }
@@ -1369,65 +1321,6 @@ export default class AccountViewView extends Vue {
     );
   }
 
-  async uploadImportFile(event: Event): Promise<void> {
-    inputImportFileNameRef.value = (
-      event.target as HTMLInputElement
-    ).files?.[0];
-  }
-
-  showContactImport(): boolean {
-    return !!inputImportFileNameRef.value;
-  }
-
-  confirmSubmitImportFile(): void {
-    if (inputImportFileNameRef.value != null) {
-      this.notify.confirm(
-        ACCOUNT_VIEW_CONSTANTS.WARNINGS.IMPORT_REPLACE_WARNING,
-        this.submitImportFile,
-      );
-    }
-  }
-
-  /**
-   * Asynchronously imports the database from a downloadable JSON file.
-   *
-   * @throws Will notify the user if there is an export error.
-   */
-  async submitImportFile(): Promise<void> {
-    if (inputImportFileNameRef.value != null) {
-      // TODO: implement this for SQLite
-    }
-  }
-
-  async checkContactImports(): Promise<void> {
-    const reader = new FileReader();
-    reader.onload = (event) => {
-      const fileContent: string = (event.target?.result as string) || "{}";
-      try {
-        const contents: ImportContent = JSON.parse(fileContent);
-        const contactTableRows: Array<Contact> = (
-          contents.data?.data as [{ tableName: string; rows: Array<Contact> }]
-        )?.find((table) => table.tableName === "contacts")
-          ?.rows as Array<Contact>;
-        const contactRows = contactTableRows.map(
-          // @ts-expect-error for omitting this field that is found in the Dexie format
-          (contact) => R.omit(["$types"], contact) as Contact,
-        );
-        (this.$router as Router).push({
-          name: "contact-import",
-          query: { contacts: JSON.stringify(contactRows) },
-        });
-      } catch (error) {
-        logger.error("Error checking contact imports:", error);
-        this.notify.error(
-          ACCOUNT_VIEW_CONSTANTS.ERRORS.IMPORT_ERROR,
-          TIMEOUTS.STANDARD,
-        );
-      }
-    };
-    reader.readAsText(inputImportFileNameRef.value as Blob);
-  }
-
   private progressCallback(progress: ImportProgress): boolean {
     logger.log(
       `Import progress: ${progress.completedRows} of ${progress.totalRows} rows completed.`,

src/views/ContactEditView.vue

@@ -338,9 +338,10 @@ export default class ContactEditView extends Vue {
     }
 
     // Save to database via PlatformServiceMixin
+    // Normalize empty strings to null to preserve database consistency
     await this.$updateContact(this.contact?.did || "", {
-      name: this.contactName,
+      name: this.contactName?.trim() || null,
-      notes: this.contactNotes,
+      notes: this.contactNotes?.trim() || null,
       contactMethods: contactMethods,
     });
 

src/views/DIDView.vue

@@ -20,12 +20,12 @@
       </button>
 
       <!-- Help button -->
-      <button
+      <router-link
+        :to="{ name: 'help' }"
         class="block ms-auto text-sm 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-1.5 rounded-full"
-        @click="goToHelp()"
       >
         <font-awesome icon="question" class="block text-center w-[1em]" />
-      </button>
+      </router-link>
     </div>
 
     <!-- Identity Details -->

src/views/DeepLinkRedirectView.vue

@@ -157,27 +157,11 @@ export default class DeepLinkRedirectView extends Vue {
     }
 
     try {
-      const capabilities = this.platformService.getCapabilities();
-
-      // If we're already in the native app, use router navigation instead
-      // of window.location.href (which doesn't work properly in Capacitor)
-      if (capabilities.isNativeApp) {
-        // Navigate directly using the router
-        const destinationPath = `/${this.destinationUrl}`;
-        this.$router.push(destinationPath).catch((error) => {
-          logger.error("Router navigation failed: " + errorStringForLog(error));
-          this.pageError =
-            "Unable to navigate to the destination. Please use a manual option below.";
-        });
-        return;
-      }
-
-      // For web contexts, use window.location.href to redirect to app
       // For mobile, try the deep link URL; for desktop, use the web URL
       const redirectUrl = this.isMobile ? this.deepLinkUrl : this.webUrl;
 
       // Method 1: Try window.location.href (works on most browsers)
-      window.location.href = redirectUrl; // Do not use this on native apps! The channel to Capacitor gets messed up.
+      window.location.href = redirectUrl;
 
       // Method 2: Fallback - create and click a link element
       setTimeout(() => {

src/views/HomeView.vue

@@ -898,7 +898,13 @@ export default class HomeView extends Vue {
           this.starredPlanHandleIds,
           this.lastAckedStarredPlanChangesJwtId,
         );
-        this.numNewStarredProjectChanges = starredProjectChanges.data.length;
+        // filter out any data elements where there is no wrappedClaimBefore
+        const filteredNewStarredProjectChanges =
+          starredProjectChanges.data.filter(
+            (change) => change.wrappedClaimBefore !== undefined,
+          );
+        this.numNewStarredProjectChanges =
+          filteredNewStarredProjectChanges.length;
         this.newStarredProjectChangesHitLimit = starredProjectChanges.hitLimit;
       } catch (error) {
         // Don't show errors for starred project changes as it's a secondary feature

src/views/NewActivityView.vue

@@ -284,7 +284,10 @@
               </table>
             </div>
           </div>
-          <div v-else>The changes did not affect essential project data.</div>
+          <div v-else>
+            The changes are not important, like it was saved by accident or
+            you've seen it all before.
+          </div>
           <!-- New line that appears on hover -->
           <div
             class="absolute left-0 w-full text-left text-gray-500 text-sm hidden group-hover:flex cursor-pointer items-center"
@@ -589,13 +592,13 @@ export default class NewActivityView extends Vue {
 
     for (const planChange of planChanges) {
       const currentPlan: PlanSummaryRecord = planChange.plan;
-      const wrappedClaim: GenericCredWrapper<PlanActionClaim> =
+      const wrappedClaim: GenericCredWrapper<PlanActionClaim> | undefined =
         planChange.wrappedClaimBefore;
 
       // Extract the actual claim from the wrapped claim
-      let previousClaim: PlanActionClaim;
+      let previousClaim: PlanActionClaim | undefined;
 
-      const embeddedClaim: PlanActionClaim = wrappedClaim.claim;
+      const embeddedClaim: PlanActionClaim | undefined = wrappedClaim?.claim;
       if (
         embeddedClaim &&
         typeof embeddedClaim === "object" &&
@@ -609,7 +612,9 @@ export default class NewActivityView extends Vue {
         previousClaim = embeddedClaim;
       }
 
-      if (!previousClaim || !currentPlan.handleId) {
+      if (!previousClaim) {
+        // Can happen when a project is starred after the stored last-seen-change-jwt ID
+        // so we'll just leave the message saying there are no important differences.
         continue;
       }
 

src/views/NewEditProjectView.vue

@@ -60,12 +60,60 @@
     </div>
     <ImageMethodDialog ref="imageDialog" default-camera-mode="environment" />
 
-    <input
+    <!-- Authorized Representative Selection -->
-      v-model="agentDid"
+    <div class="w-full flex items-stretch my-4">
-      type="text"
+      <div
-      placeholder="Other Authorized Representative"
+        class="flex items-center gap-2 grow border border-slate-400 border-r-0 last:border-r px-3 py-2 rounded-l last:rounded overflow-hidden cursor-pointer hover:bg-slate-100"
-      class="mt-4 block w-full rounded border border-slate-400 px-3 py-2"
+        @click="openRepresentativeDialog"
+      >
+        <div>
+          <EntityIcon
+            v-if="selectedRepresentative"
+            :contact="selectedRepresentative"
+            class="!size-[2rem] shrink-0 border border-slate-300 bg-white overflow-hidden rounded-full"
+          />
+          <font-awesome v-else icon="user" class="text-slate-400" />
+        </div>
+        <div class="overflow-hidden">
+          <div
+            :class="{
+              'text-sm font-semibold': selectedRepresentative,
+              'text-slate-400': !selectedRepresentative,
+            }"
+            class="truncate"
+          >
+            {{
+              selectedRepresentative
+                ? selectedRepresentative.name || AppString.NO_CONTACT_NAME
+                : "Assign Authorized Representative…"
+            }}
+          </div>
+          <div
+            v-if="selectedRepresentative"
+            class="text-xs text-slate-500 truncate"
+          >
+            {{ agentDid }}
+          </div>
+        </div>
+      </div>
+      <button
+        v-if="selectedRepresentative"
+        class="text-rose-600 px-3 py-2 border border-slate-400 border-l-0 rounded-r hover:bg-rose-600 hover:text-white hover:border-rose-600"
+        @click="unsetRepresentative"
+      >
+        <font-awesome icon="trash-can" />
+      </button>
+    </div>
+
+    <ProjectRepresentativeDialog
+      ref="representativeDialog"
+      :all-contacts="allContacts"
+      :active-did="activeDid"
+      :all-my-dids="allMyDids"
+      :notify="$notify"
+      @assign="handleRepresentativeAssigned"
     />
+
     <div class="mb-4">
       <p v-if="shouldShowOwnershipWarning">
         <span class="text-red-500">Beware!</span>
@@ -232,9 +280,12 @@ import { LMap, LMarker, LTileLayer } from "@vue-leaflet/vue-leaflet";
 import { RouteLocationNormalizedLoaded, Router } from "vue-router";
 import { LeafletMouseEvent } from "leaflet";
 
+import EntityIcon from "../components/EntityIcon.vue";
 import ImageMethodDialog from "../components/ImageMethodDialog.vue";
+import ProjectRepresentativeDialog from "../components/ProjectRepresentativeDialog.vue";
 import QuickNav from "../components/QuickNav.vue";
 import {
+  AppString,
   DEFAULT_IMAGE_API_SERVER,
   DEFAULT_PARTNER_API_SERVER,
   NotificationIface,
@@ -268,6 +319,7 @@ import {
   retrieveAccountCount,
   retrieveFullyDecryptedAccount,
 } from "../libs/util";
+import { Contact } from "../db/tables/contacts";
 
 import {
   EventTemplate,
@@ -323,7 +375,15 @@ import { logger } from "../utils/logger";
  */
 
 @Component({
-  components: { ImageMethodDialog, LMap, LMarker, LTileLayer, QuickNav },
+  components: {
+    EntityIcon,
+    ImageMethodDialog,
+    ProjectRepresentativeDialog,
+    LMap,
+    LMarker,
+    LTileLayer,
+    QuickNav,
+  },
   mixins: [PlatformServiceMixin],
 })
 export default class NewEditProjectView extends Vue {
@@ -334,6 +394,9 @@ export default class NewEditProjectView extends Vue {
   // Notification helpers
   private notify!: ReturnType<typeof createNotifyHelpers>;
 
+  // Constants
+  AppString = AppString;
+
   /**
    * Display error notification to user
    * Provides consistent error messaging with 5-second timeout
@@ -346,6 +409,8 @@ export default class NewEditProjectView extends Vue {
   // Component state properties
   activeDid = "";
   agentDid = "";
+  allContacts: Array<Contact> = [];
+  allMyDids: string[] = [];
   apiServer = "";
   endDateInput?: string;
   endTimeInput?: string;
@@ -392,16 +457,24 @@ export default class NewEditProjectView extends Vue {
     const activeIdentity = await (this as any).$getActiveIdentity();
     this.activeDid = activeIdentity.activeDid || "";
 
+    // Get all user's DIDs
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    this.allMyDids = await (this as any).$getAllAccountDids();
+
+    // Load contacts sorted by date added (newest first) for consistent "Recently Added" display
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    this.allContacts = await (this as any).$contactsByDateAdded();
+
     this.apiServer = settings.apiServer || "";
     this.showGeneralAdvanced = !!settings.showGeneralAdvanced;
 
     this.projectId = (this.$route.query["projectId"] as string) || "";
 
-    if (this.projectId) {
+    if (this.isSavedProject()) {
       if (this.numAccounts === 0) {
         this.notify.error(NOTIFY_PROJECT_ACCOUNT_LOADING_ERROR.message);
       } else {
-        this.loadProject(this.activeDid);
+        this.loadProject(this.activeDid, this.projectId);
       }
     }
   }
@@ -411,11 +484,9 @@ export default class NewEditProjectView extends Vue {
    * Retrieves project information from the API and populates form fields
    * @param userDid - User's decentralized identifier
    */
-  async loadProject(userDid: string) {
+  async loadProject(userDid: string, projectId: string) {
     const url =
-      this.apiServer +
+      this.apiServer + "/api/claim/byHandle/" + encodeURIComponent(projectId);
-      "/api/claim/byHandle/" +
-      encodeURIComponent(this.projectId);
     const headers = await getHeaders(userDid);
 
     try {
@@ -432,6 +503,12 @@ export default class NewEditProjectView extends Vue {
         }
         if (this.fullClaim?.agent?.identifier) {
           this.agentDid = this.fullClaim.agent.identifier;
+          if (this.activeDid !== this.projectIssuerDid) {
+            this.agentDid = this.projectIssuerDid;
+            this.notify.warning(
+              "You were previously the agent, so the agent has been set to the previous owner. You can change it.",
+            );
+          }
         }
         if (this.fullClaim.startTime) {
           const localDateTime = DateTime.fromISO(
@@ -536,7 +613,7 @@ export default class NewEditProjectView extends Vue {
   private async saveProject() {
     // Make a claim
     const vcClaim: PlanActionClaim = this.fullClaim;
-    if (this.projectId) {
+    if (this.isSavedProject()) {
       vcClaim.lastClaimId = this.lastClaimJwtId;
     }
     if (this.agentDid) {
@@ -870,6 +947,10 @@ export default class NewEditProjectView extends Vue {
     this.longitude = event.latlng.lng;
   }
 
+  private isSavedProject(): boolean {
+    return !!this.projectId;
+  }
+
   /**
    * Computed property for character count display
    * Shows current description length and maximum character limit
@@ -885,6 +966,7 @@ export default class NewEditProjectView extends Vue {
    */
   get shouldShowOwnershipWarning(): boolean {
     return (
+      this.isSavedProject() &&
       this.activeDid !== this.projectIssuerDid &&
       this.agentDid !== this.projectIssuerDid
     );
@@ -961,5 +1043,37 @@ export default class NewEditProjectView extends Vue {
   get shouldShowSpinner(): boolean {
     return !this.isHiddenSpinner;
   }
+
+  /**
+   * Computed property for selected representative contact
+   * Derives the contact from agentDid by finding it in allContacts
+   */
+  get selectedRepresentative(): Contact | null {
+    if (!this.agentDid) {
+      return null;
+    }
+    return this.allContacts.find((c) => c.did === this.agentDid) || null;
+  }
+
+  /**
+   * Open the representative selection dialog
+   */
+  openRepresentativeDialog(): void {
+    (this.$refs.representativeDialog as ProjectRepresentativeDialog).open();
+  }
+
+  /**
+   * Handle representative assignment from dialog
+   */
+  handleRepresentativeAssigned(contact: Contact): void {
+    this.agentDid = contact.did;
+  }
+
+  /**
+   * Unset the representative and revert to initial state
+   */
+  unsetRepresentative(): void {
+    this.agentDid = "";
+  }
 }
 </script>

src/views/OnboardMeetingSetupView.vue

@@ -186,16 +186,59 @@
         <div>
           <label
             for="projectLink"
-            class="block text-sm font-medium text-gray-700"
+            class="block text-sm font-medium text-gray-700 mb-1"
             >Project Link</label
           >
-          <input
+          <div class="w-full flex items-stretch">
-            id="projectLink"
+            <div
-            v-model="newOrUpdatedMeetingInputs.projectLink"
+              class="flex items-center gap-2 grow border border-slate-400 border-r-0 last:border-r px-3 py-2 rounded-l last:rounded overflow-hidden cursor-pointer hover:bg-slate-100"
-            type="text"
+              @click="openProjectLinkDialog"
-            class="mt-1 block w-full rounded-md border border-gray-300 px-3 py-2 shadow-sm focus:border-blue-500 focus:outline-none"
+            >
-            placeholder="Project ID"
+              <div>
-          />
+                <ProjectIcon
+                  v-if="selectedProject"
+                  :entity-id="selectedProject.handleId"
+                  :icon-size="30"
+                  :image-url="selectedProject.image"
+                  class="!size-[2rem] shrink-0 border border-slate-300 bg-white overflow-hidden rounded-full"
+                />
+                <font-awesome
+                  v-else
+                  icon="folder-open"
+                  class="text-slate-400"
+                />
+              </div>
+              <div class="overflow-hidden">
+                <div
+                  :class="{
+                    'text-sm font-semibold': selectedProject,
+                    'text-slate-400': !selectedProject,
+                  }"
+                  class="truncate"
+                >
+                  {{
+                    selectedProject
+                      ? selectedProject.name || "Unnamed Project"
+                      : "Select Project…"
+                  }}
+                </div>
+                <div
+                  v-if="selectedProject"
+                  class="text-xs text-slate-500 truncate"
+                >
+                  <font-awesome icon="user" class="text-slate-400" />
+                  {{ selectedProjectIssuerName }}
+                </div>
+              </div>
+            </div>
+            <button
+              v-if="selectedProject"
+              class="text-rose-600 px-3 py-2 border border-slate-400 border-l-0 rounded-r hover:bg-rose-600 hover:text-white hover:border-rose-600"
+              @click="unsetProjectLink"
+            >
+              <font-awesome icon="trash-can" />
+            </button>
+          </div>
         </div>
 
         <button
@@ -224,6 +267,17 @@
       </form>
     </div>
 
+    <MeetingProjectDialog
+      ref="meetingProjectDialog"
+      :active-did="activeDid"
+      :all-my-dids="allMyDids"
+      :all-contacts="allContacts"
+      :notify="$notify"
+      @assign="handleProjectLinkAssigned"
+      @open="handleDialogOpen"
+      @close="handleDialogClose"
+    />
+
     <!-- Members Section -->
     <div
       v-if="!isLoading && currentMeeting != null && !!currentMeeting.password"
@@ -254,6 +308,7 @@
       </ul>
 
       <MembersList
+        ref="membersList"
         :password="currentMeeting.password || ''"
         :show-organizer-tools="true"
         class="mt-4"
@@ -292,10 +347,13 @@ import { RouteLocationNormalizedLoaded, Router } from "vue-router";
 import QuickNav from "../components/QuickNav.vue";
 import TopMessage from "../components/TopMessage.vue";
 import MembersList from "../components/MembersList.vue";
+import MeetingProjectDialog from "../components/MeetingProjectDialog.vue";
+import ProjectIcon from "../components/ProjectIcon.vue";
 import {
   errorStringForLog,
   getHeaders,
   serverMessageForUser,
+  didInfo,
 } from "../libs/endorserServer";
 import { encryptMessage } from "../libs/crypto";
 import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
@@ -309,6 +367,8 @@ import {
   NOTIFY_MEETING_DELETED,
   NOTIFY_MEETING_LINK_COPIED,
 } from "@/constants/notifications";
+import { PlanData } from "../interfaces/records";
+import { Contact } from "../db/tables/contacts";
 interface ServerMeeting {
   groupId: number; // from the server
   name: string; // to & from the server
@@ -331,6 +391,8 @@ interface MeetingSetupInputs {
     QuickNav,
     TopMessage,
     MembersList,
+    MeetingProjectDialog,
+    ProjectIcon,
   },
   mixins: [PlatformServiceMixin],
 })
@@ -354,6 +416,9 @@ export default class OnboardMeetingView extends Vue {
   isRegistered = false;
   showDeleteConfirm = false;
   fullName = "";
+  allContacts: Contact[] = [];
+  allMyDids: string[] = [];
+  selectedProjectData: PlanData | null = null;
   get minDateTime() {
     const now = new Date();
     now.setMinutes(now.getMinutes() + 5); // Set minimum 5 minutes in the future
@@ -370,7 +435,17 @@ export default class OnboardMeetingView extends Vue {
     this.fullName = settings?.firstName || "";
     this.isRegistered = !!settings?.isRegistered;
 
+    // Load contacts and DIDs for dialog
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    this.allContacts = await (this as any).$contactsByDateAdded();
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    this.allMyDids = await (this as any).$getAllAccountDids();
+
     await this.fetchCurrentMeeting();
+
+    // Ensure selected project is loaded if projectLink exists
+    await this.ensureSelectedProjectLoaded();
+
     this.isLoading = false;
   }
 
@@ -442,6 +517,54 @@ export default class OnboardMeetingView extends Vue {
     }
   }
 
+  /**
+   * Ensure the selected project is loaded if projectLink exists
+   */
+  async ensureSelectedProjectLoaded(): Promise<void> {
+    const projectLink =
+      this.currentMeeting?.projectLink ||
+      this.newOrUpdatedMeetingInputs?.projectLink;
+
+    if (!projectLink) {
+      this.selectedProjectData = null;
+      return;
+    }
+
+    await this.fetchProjectByHandleId(projectLink);
+  }
+
+  /**
+   * Fetch a single project by handleId
+   * @param handleId - The project handleId to fetch
+   */
+  async fetchProjectByHandleId(handleId: string): Promise<void> {
+    try {
+      const headers = await getHeaders(this.activeDid);
+      const url = `${this.apiServer}/api/v2/report/plans?handleId=${encodeURIComponent(handleId)}`;
+      const resp = await this.axios.get(url, { headers });
+
+      if (resp.status === 200 && resp.data.data && resp.data.data.length > 0) {
+        const project = resp.data.data[0];
+        this.selectedProjectData = {
+          name: project.name,
+          description: project.description,
+          image: project.image,
+          handleId: project.handleId,
+          issuerDid: project.issuerDid,
+          rowId: project.rowId,
+        };
+      } else {
+        this.selectedProjectData = null;
+      }
+    } catch (error) {
+      this.$logAndConsole(
+        "Error fetching project by handleId: " + errorStringForLog(error),
+        true,
+      );
+      this.selectedProjectData = null;
+    }
+  }
+
   async createMeeting() {
     this.isLoading = true;
 
@@ -576,7 +699,7 @@ export default class OnboardMeetingView extends Vue {
     }
   }
 
-  startEditing() {
+  async startEditing() {
     // Populate form with existing meeting data
     if (this.currentMeeting) {
       const localExpiresAt = new Date(this.currentMeeting.expiresAt);
@@ -587,6 +710,10 @@ export default class OnboardMeetingView extends Vue {
         password: this.currentMeeting.password || "",
         projectLink: this.currentMeeting.projectLink || "",
       };
+      // Ensure selected project is loaded if projectLink exists
+      if (this.currentMeeting.projectLink) {
+        await this.ensureSelectedProjectLoaded();
+      }
     } else {
       this.$logError(
         "There is no current meeting to edit. We should never get here.",
@@ -594,9 +721,15 @@ export default class OnboardMeetingView extends Vue {
     }
   }
 
-  cancelEditing() {
+  async cancelEditing() {
     // Reset form data
     this.newOrUpdatedMeetingInputs = null;
+    // Restore selected project from currentMeeting if it exists
+    if (this.currentMeeting?.projectLink) {
+      await this.ensureSelectedProjectLoaded();
+    } else {
+      this.selectedProjectData = null;
+    }
   }
 
   async updateMeeting() {
@@ -710,5 +843,78 @@ export default class OnboardMeetingView extends Vue {
       this.notify.error("Failed to copy meeting link to clipboard.");
     }
   }
+
+  /**
+   * Computed property for selected project
+   * Returns the separately stored selected project data
+   */
+  get selectedProject(): PlanData | null {
+    return this.selectedProjectData;
+  }
+
+  /**
+   * Computed property for selected project issuer display name
+   * Uses didInfo to format the issuer name similar to ProjectCard
+   */
+  get selectedProjectIssuerName(): string {
+    if (!this.selectedProject) {
+      return "";
+    }
+    return didInfo(
+      this.selectedProject.issuerDid,
+      this.activeDid,
+      this.allMyDids,
+      this.allContacts,
+    );
+  }
+
+  /**
+   * Open the project link selection dialog
+   */
+  openProjectLinkDialog(): void {
+    (this.$refs.meetingProjectDialog as MeetingProjectDialog).open();
+  }
+
+  /**
+   * Handle project assignment from dialog
+   */
+  handleProjectLinkAssigned(project: PlanData): void {
+    // Store the selected project directly
+    this.selectedProjectData = project;
+
+    if (this.newOrUpdatedMeetingInputs) {
+      this.newOrUpdatedMeetingInputs.projectLink = project.handleId;
+    }
+  }
+
+  /**
+   * Unset the project link and revert to initial state
+   */
+  unsetProjectLink(): void {
+    this.selectedProjectData = null;
+    if (this.newOrUpdatedMeetingInputs) {
+      this.newOrUpdatedMeetingInputs.projectLink = "";
+    }
+  }
+
+  /**
+   * Handle dialog open event - stop auto-refresh in MembersList
+   */
+  handleDialogOpen(): void {
+    const membersList = this.$refs.membersList as MembersList;
+    if (membersList) {
+      membersList.stopAutoRefresh();
+    }
+  }
+
+  /**
+   * Handle dialog close event - start auto-refresh in MembersList
+   */
+  handleDialogClose(): void {
+    const membersList = this.$refs.membersList as MembersList;
+    if (membersList) {
+      membersList.startAutoRefresh();
+    }
+  }
 }
 </script>

src/views/TestView.vue

@@ -57,6 +57,9 @@
         <button :class="sqlLinkClasses" @click="setAccountsQuery">
           Accounts
         </button>
+        <button :class="sqlLinkClasses" @click="setActiveIdentityQuery">
+          Active DID
+        </button>
         <button :class="sqlLinkClasses" @click="setContactsQuery">
           Contacts
         </button>
@@ -525,6 +528,11 @@ export default class Help extends Vue {
     this.executeSql();
   }
 
+  setActiveIdentityQuery() {
+    this.sqlQuery = "SELECT * FROM active_identity;";
+    this.executeSql();
+  }
+
   setContactsQuery() {
     this.sqlQuery = "SELECT * FROM contacts;";
     this.executeSql();