feat: add missing settings management functions

- Add getSettingsForAccount() to retrieve complete settings for any account DID - Add getAccountSpecificSettings() to get account-specific settings without defaults - Add mergeSettings() for consistent settings merging across SQLite and Dexie - Update retrieveSettingsForActiveAccount() to use new mergeSettings() function - Improve error handling and logging for settings operations - Maintain backward compatibility with existing settings API This provides better settings management capabilities for account switching, debugging, and data validation while ensuring consistent behavior across both SQLite and Dexie storage implementations.
2025-06-10 12:44:52 +00:00
26 changed files with 1015 additions and 1893 deletions
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -374,7 +374,7 @@ Prerequisites: macOS with Xcode installed
   xcrun agvtool new-version 25
   # Unfortunately this edits Info.plist directly.
   #xcrun agvtool new-marketing-version 0.4.5
-   cat App.xcodeproj/project.pbxproj | sed "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 0.5.1;/g" > temp
+   cat App.xcodeproj/project.pbxproj | sed "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 0.5.0;/g" > temp
   mv temp App.xcodeproj/project.pbxproj
   cd -
   ```
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -31,8 +31,8 @@ android {
        applicationId "app.timesafari.app"
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 26
-        versionName "0.5.1"
+        versionCode 25
+        versionName "0.5.0"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        aaptOptions {
             // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
--- a/ios/App/App.xcodeproj/project.pbxproj
+++ b/ios/App/App.xcodeproj/project.pbxproj
@@ -403,7 +403,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 26;
+				CURRENT_PROJECT_VERSION = 25;
 				DEVELOPMENT_TEAM = GM3FS5JQPH;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -413,7 +413,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.5.1;
+				MARKETING_VERSION = 0.5.0;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -430,7 +430,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 26;
+				CURRENT_PROJECT_VERSION = 25;
 				DEVELOPMENT_TEAM = GM3FS5JQPH;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -440,7 +440,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.5.1;
+				MARKETING_VERSION = 0.5.0;
 				PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "timesafari",
-  "version": "0.5.1",
+  "version": "0.4.8",
  "description": "Time Safari Application",
  "author": {
    "name": "Time Safari Team"
--- a/src/components/FeedFilters.vue
+++ b/src/components/FeedFilters.vue
@@ -104,6 +104,7 @@ import { USE_DEXIE_DB } from "@/constants/app";
 import * as databaseUtil from "../db/databaseUtil";
 import { MASTER_SETTINGS_KEY } from "../db/tables/settings";
 import { db, retrieveSettingsForActiveAccount } from "../db/index";
+import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";

@Component({
  components: {
@@ -142,23 +143,19 @@ export default class FeedFilters extends Vue {
  async toggleHasVisibleDid() {
    this.settingChanged = true;
    this.hasVisibleDid = !this.hasVisibleDid;
-    await databaseUtil.updateDefaultSettings({
+    await db.settings.update(MASTER_SETTINGS_KEY, {
      filterFeedByVisible: this.hasVisibleDid,
    });
-
-    if (USE_DEXIE_DB) {
-      await db.settings.update(MASTER_SETTINGS_KEY, {
-        filterFeedByVisible: this.hasVisibleDid,
-      });
-    }
  }

  async toggleNearby() {
    this.settingChanged = true;
    this.isNearby = !this.isNearby;
-    await databaseUtil.updateDefaultSettings({
-      filterFeedByNearby: this.isNearby,
-    });
+    const platformService = PlatformServiceFactory.getInstance();
+    await platformService.dbExec(
+      `UPDATE settings SET filterFeedByNearby = ? WHERE id = ?`,
+      [this.isNearby, MASTER_SETTINGS_KEY],
+    );

    if (USE_DEXIE_DB) {
      await db.settings.update(MASTER_SETTINGS_KEY, {
@@ -172,10 +169,11 @@ export default class FeedFilters extends Vue {
      this.settingChanged = true;
    }

-    await databaseUtil.updateDefaultSettings({
-      filterFeedByNearby: false,
-      filterFeedByVisible: false,
-    });
+    const platformService = PlatformServiceFactory.getInstance();
+    await platformService.dbExec(
+      `UPDATE settings SET filterFeedByNearby = ? AND filterFeedByVisible = ? WHERE id = ?`,
+      [false, false, MASTER_SETTINGS_KEY],
+    );

    if (USE_DEXIE_DB) {
      await db.settings.update(MASTER_SETTINGS_KEY, {
@@ -193,10 +191,11 @@ export default class FeedFilters extends Vue {
      this.settingChanged = true;
    }

-    await databaseUtil.updateDefaultSettings({
-      filterFeedByNearby: true,
-      filterFeedByVisible: true,
-    });
+    const platformService = PlatformServiceFactory.getInstance();
+    await platformService.dbExec(
+      `UPDATE settings SET filterFeedByNearby = ? AND filterFeedByVisible = ? WHERE id = ?`,
+      [true, true, MASTER_SETTINGS_KEY],
+    );

    if (USE_DEXIE_DB) {
      await db.settings.update(MASTER_SETTINGS_KEY, {
--- a/src/components/GiftedDialog.vue
+++ b/src/components/GiftedDialog.vue
@@ -1,477 +1,99 @@
 <template>
  <div v-if="visible" class="dialog-overlay">
    <div class="dialog">
-      <!-- Step 1: Giver -->
-      <div v-show="currentStep === 1" id="sectionGiftedGiver">
-        <label class="block font-bold mb-4">
-          {{
-            stepType === "recipient"
-              ? "Choose who received the gift:"
-              : showProjects
-                ? "Choose a project benefitted from:"
-                : "Choose a person received from:"
-          }}
-        </label>
-
-        <!-- Unified Quick-pick grid for People and Projects -->
-        <ul
-          :class="
-            shouldShowProjects
-              ? 'grid grid-cols-3 md:grid-cols-4 gap-x-2 gap-y-4 text-center mb-4'
-              : 'grid grid-cols-4 sm:grid-cols-5 md:grid-cols-6 gap-x-2 gap-y-4 text-center mb-4'
-          "
+      <h1 class="text-xl font-bold text-center mb-4">
+        {{ customTitle }}
+      </h1>
+      <input
+        v-model="description"
+        type="text"
+        class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
+        :placeholder="prompt || 'What was given?'"
+      />
+      <div class="flex flex-row justify-center">
+        <span
+          class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center text-blue-500 px-2 py-2 w-20"
+          @click="changeUnitCode()"
        >
-          <template v-if="shouldShowProjects">
-            <!-- show projects -->
-            <li
-              v-for="project in projects.slice(0, 7)"
-              :key="project.handleId"
-              class="cursor-pointer"
-              @click="
-                stepType === 'recipient'
-                  ? selectRecipientProject(project)
-                  : selectProject(project)
-              "
-            >
-              <div class="relative w-fit mx-auto">
-                <ProjectIcon
-                  :entity-id="project.handleId"
-                  :icon-size="48"
-                  :image-url="project.image"
-                  class="!size-[3rem] mx-auto border border-slate-300 bg-white overflow-hidden rounded-full mb-1"
-                />
-              </div>
-              <h3
-                class="text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden"
-              >
-                {{ project.name }}
-              </h3>
-              <div class="text-xs text-slate-500 truncate">
-                <font-awesome icon="user" class="fa-fw text-slate-400" />
-                {{
-                  didInfo(project.issuerDid, activeDid, allMyDids, allContacts)
-                }}
-              </div>
-            </li>
-            <li
-              v-if="projects.length === 0"
-              class="text-xs text-slate-500 italic col-span-full"
-            >
-              (No projects found.)
-            </li>
-            <li v-if="projects.length > 0">
-              <router-link :to="{ name: 'discover' }" class="cursor-pointer">
-                <font-awesome
-                  icon="circle-right"
-                  class="text-blue-500 text-5xl mb-1"
-                />
-                <h3
-                  class="text-xs text-slate-500 font-medium italic text-ellipsis whitespace-nowrap overflow-hidden"
-                >
-                  Show All
-                </h3>
-              </router-link>
-            </li>
-          </template>
-          <template v-else>
-            <!-- show people (contacts) -->
-            <li
-              v-if="
-                stepType === 'recipient' ||
-                (stepType === 'giver' && isFromProjectView)
-              "
-              :class="{
-                'cursor-pointer': !wouldCreateConflict(activeDid),
-                'cursor-not-allowed opacity-50': wouldCreateConflict(activeDid)
-              }"
-              @click="
-                !wouldCreateConflict(activeDid) &&
-                (stepType === 'recipient'
-                  ? selectRecipient({ did: activeDid, name: 'You' })
-                  : selectGiver({ did: activeDid, name: 'You' }))
-              "
-            >
-              <font-awesome 
-                :class="{
-                  'text-blue-500 text-5xl mb-1': !wouldCreateConflict(activeDid),
-                  'text-slate-400 text-5xl mb-1': wouldCreateConflict(activeDid)
-                }" 
-                icon="hand" 
-              />
-              <h3
-                :class="{
-                  'text-xs text-blue-500 font-medium text-ellipsis whitespace-nowrap overflow-hidden': !wouldCreateConflict(activeDid),
-                  'text-xs text-slate-400 font-medium text-ellipsis whitespace-nowrap overflow-hidden': wouldCreateConflict(activeDid)
-                }"
-              >
-                You
-              </h3>
-            </li>
-            <li
-              class="cursor-pointer"
-              @click="
-                stepType === 'recipient' ? selectRecipient() : selectGiver()
-              "
-            >
-              <font-awesome
-                icon="circle-question"
-                class="text-slate-400 text-5xl mb-1"
-              />
-              <h3
-                class="text-xs text-slate-500 font-medium italic text-ellipsis whitespace-nowrap overflow-hidden"
-              >
-                Unnamed
-              </h3>
-            </li>
-            <li
-              v-if="allContacts.length === 0"
-              class="text-xs text-slate-500 italic col-span-full"
-            >
-              (Add friends to see more people worthy of recognition.)
-            </li>
-            <li
-              v-for="contact in allContacts.slice(0, 10)"
-              :key="contact.did"
-              :class="{
-                'cursor-pointer': !wouldCreateConflict(contact.did),
-                'cursor-not-allowed opacity-50': wouldCreateConflict(contact.did)
-              }"
-              @click="
-                !wouldCreateConflict(contact.did) &&
-                (stepType === 'recipient'
-                  ? selectRecipient(contact)
-                  : selectGiver(contact))
-              "
-            >
-              <div class="relative w-fit mx-auto">
-                <EntityIcon
-                  :contact="contact"
-                  class="!size-[3rem] mx-auto border border-slate-300 bg-white overflow-hidden rounded-full mb-1"
-                />
-                <div
-                  class="rounded-full bg-slate-400 absolute bottom-0 right-0 p-1 translate-x-1/3"
-                >
-                  <font-awesome
-                    icon="clock"
-                    class="block text-white text-xs w-[1em]"
-                  />
-                </div>
-              </div>
-              <h3
-                :class="{
-                  'text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden': !wouldCreateConflict(contact.did),
-                  'text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden text-slate-400': wouldCreateConflict(contact.did)
-                }"
-              >
-                {{ contact.name || contact.did }}
-              </h3>
-            </li>
-            <li v-if="allContacts.length > 0" class="cursor-pointer">
-              <router-link
-                :to="{
-                  name: 'contact-gift',
-                  query: {
-                    stepType: stepType,
-                    giverEntityType: giverEntityType,
-                    recipientEntityType: recipientEntityType,
-                    ...(stepType === 'giver'
-                      ? {
-                          recipientProjectId: toProjectId,
-                          recipientProjectName: receiver?.name,
-                          recipientProjectImage: receiver?.image,
-                          recipientProjectHandleId: receiver?.handleId,
-                          recipientDid: receiver?.did,
-                        }
-                      : {
-                          giverProjectId: fromProjectId,
-                          giverProjectName: giver?.name,
-                          giverProjectImage: giver?.image,
-                          giverProjectHandleId: giver?.handleId,
-                          giverDid: giver?.did,
-                        }),
-                    fromProjectId: fromProjectId,
-                    toProjectId: toProjectId,
-                    showProjects: (showProjects || false).toString(),
-                    isFromProjectView: (isFromProjectView || false).toString(),
-                  },
-                }"
-              >
-                <font-awesome
-                  icon="circle-right"
-                  class="text-blue-500 text-5xl mb-1"
-                />
-                <h3
-                  class="text-xs text-slate-500 font-medium italic text-ellipsis whitespace-nowrap overflow-hidden"
-                >
-                  Show All
-                </h3>
-              </router-link>
-            </li>
-          </template>
-        </ul>
-
+          {{ libsUtil.UNIT_SHORT[unitCode] || unitCode }}
+        </span>
+        <div
+          class="border border-r-0 border-slate-400 bg-slate-200 px-4 py-2"
+          @click="amountInput === '0' ? null : decrement()"
+        >
+          <font-awesome icon="chevron-left" />
+        </div>
+        <input
+          id="inputGivenAmount"
+          v-model="amountInput"
+          type="number"
+          class="border border-r-0 border-slate-400 px-2 py-2 text-center w-20"
+        />
+        <div
+          class="rounded-r border border-slate-400 bg-slate-200 px-4 py-2"
+          @click="increment()"
+        >
+          <font-awesome icon="chevron-right" />
+        </div>
+      </div>
+      <div class="mt-4 flex justify-center">
+        <span>
+          <router-link
+            :to="{
+              name: 'gifted-details',
+              query: {
+                amountInput,
+                description,
+                giverDid: giver?.did,
+                giverName: giver?.name,
+                offerId,
+                fulfillsProjectId: toProjectId,
+                providerProjectId: fromProjectId,
+                recipientDid: receiver?.did,
+                recipientName: receiver?.name,
+                unitCode,
+              },
+            }"
+            class="text-blue-500"
+          >
+            Photo & more options ...
+          </router-link>
+        </span>
+      </div>
+      <p class="text-center mb-2 mt-6 italic">
+        Sign & Send to publish to the world
+        <font-awesome
+          icon="circle-info"
+          class="pl-2 text-blue-500 cursor-pointer"
+          @click="explainData()"
+        />
+      </p>
+      <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
        <button
-          class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-lg"
+          class="block w-full text-center text-lg font-bold uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md"
+          @click="confirm"
+        >
+          Sign &amp; Send
+        </button>
+        <button
+          class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
          @click="cancel"
        >
          Cancel
        </button>
      </div>
-
-      <!-- Step 2: Gift -->
-      <div v-show="currentStep === 2" id="sectionGiftedGift">
-        <div class="grid grid-cols-2 gap-2 mb-4">
-          <!-- Giver Button -->
-          <button
-            v-if="
-              (giverEntityType === 'person' || giverEntityType === 'project') &&
-              !(isFromProjectView && giverEntityType === 'project')
-            "
-            class="flex-1 flex items-center gap-2 bg-slate-100 border border-slate-300 rounded-md p-2"
-            @click="goBackToStep1('giver')"
-          >
-            <div>
-              <template v-if="giverEntityType === 'project'">
-                <ProjectIcon
-                  v-if="giver?.handleId"
-                  :entity-id="giver.handleId"
-                  :icon-size="32"
-                  :image-url="giver.image"
-                  class="rounded-full bg-white overflow-hidden !size-[2rem] object-cover"
-                />
-              </template>
-              <template v-else>
-                <EntityIcon
-                  v-if="giver?.did"
-                  :contact="giver"
-                  class="rounded-full bg-white overflow-hidden !size-[2rem] object-cover"
-                />
-                <font-awesome
-                  v-else
-                  icon="circle-question"
-                  class="text-slate-400 text-3xl"
-                />
-              </template>
-            </div>
-
-            <div class="text-start min-w-0">
-              <p class="text-xs text-slate-500 leading-1 -mb-1 uppercase">
-                {{
-                  giverEntityType === "project"
-                    ? "Benefited from:"
-                    : "Received from:"
-                }}
-              </p>
-              <h3 class="font-semibold truncate">
-                {{ giver?.name || "Unnamed" }}
-              </h3>
-            </div>
-
-            <p class="ms-auto text-sm text-blue-500 pe-1">
-              <font-awesome icon="pen" title="Change" />
-            </p>
-          </button>
-          <div
-            v-else
-            class="flex-1 flex items-center gap-2 bg-slate-100 border border-slate-300 rounded-md p-2"
-          >
-            <div>
-              <template v-if="giverEntityType === 'project'">
-                <ProjectIcon
-                  v-if="giver?.handleId"
-                  :entity-id="giver.handleId"
-                  :icon-size="32"
-                  :image-url="giver.image"
-                  class="rounded-full bg-white overflow-hidden !size-[2rem] object-cover"
-                />
-              </template>
-              <template v-else>
-                <EntityIcon
-                  v-if="giver?.did"
-                  :contact="giver"
-                  class="rounded-full bg-white overflow-hidden !size-[2rem] object-cover"
-                />
-                <font-awesome
-                  v-else
-                  icon="circle-question"
-                  class="text-slate-400 text-3xl"
-                />
-              </template>
-            </div>
-
-            <div class="text-start min-w-0">
-              <p class="text-xs text-slate-500 leading-1 -mb-1 uppercase">
-                {{
-                  giverEntityType === "project"
-                    ? "Benefited from:"
-                    : "Received from:"
-                }}
-              </p>
-              <h3 class="font-semibold truncate">
-                {{ giver?.name || "Unnamed" }}
-              </h3>
-            </div>
-
-            <p class="ms-auto text-sm text-slate-400 pe-1">
-              <font-awesome icon="lock" title="Can't be changed" />
-            </p>
-          </div>
-
-          <!-- Recipient Button -->
-          <button
-            v-if="recipientEntityType === 'person'"
-            class="flex-1 flex items-center gap-2 bg-slate-100 border border-slate-300 rounded-md p-2"
-            @click="goBackToStep1('recipient')"
-          >
-            <div>
-              <EntityIcon
-                v-if="receiver?.did"
-                :contact="receiver"
-                class="rounded-full bg-white overflow-hidden !size-[2rem] object-cover"
-              />
-              <font-awesome
-                v-else
-                icon="circle-question"
-                class="text-slate-400 text-3xl"
-              />
-            </div>
-
-            <div class="text-start min-w-0">
-              <p class="text-xs text-slate-500 leading-1 -mb-1 uppercase">
-                Given to:
-              </p>
-              <h3 class="font-semibold truncate">
-                {{ receiver?.name || "Unnamed" }}
-              </h3>
-            </div>
-
-            <p class="ms-auto text-sm text-blue-500 pe-1">
-              <font-awesome icon="pen" title="Change" />
-            </p>
-          </button>
-          <div
-            v-else-if="recipientEntityType === 'project'"
-            class="flex-1 flex items-center gap-2 bg-slate-100 border border-slate-300 rounded-md p-2"
-          >
-            <div>
-              <ProjectIcon
-                v-if="receiver?.handleId"
-                :entity-id="receiver.handleId"
-                :icon-size="32"
-                :image-url="receiver.image"
-                class="rounded-full bg-white overflow-hidden !size-[2rem] object-cover"
-              />
-            </div>
-
-            <div class="text-start min-w-0">
-              <p class="text-xs text-slate-500 leading-1 -mb-1 uppercase">
-                Given to project:
-              </p>
-              <h3 class="font-semibold truncate">
-                {{ receiver?.name || "Unnamed" }}
-              </h3>
-            </div>
-
-            <p class="ms-auto text-sm text-slate-400 pe-1">
-              <font-awesome icon="lock" title="Can't be changed" />
-            </p>
-          </div>
-        </div>
-        <input
-          v-model="description"
-          type="text"
-          class="block w-full rounded border border-slate-400 px-3 py-2 mb-4 placeholder:italic"
-          :placeholder="prompt || 'What was given?'"
-        />
-        <div class="flex mb-4">
-          <button
-            class="rounded-s border border-e-0 border-slate-400 bg-slate-200 px-4 py-2"
-            @click="amountInput === '0' ? null : decrement()"
-          >
-            <font-awesome icon="chevron-left" />
-          </button>
-          <input
-            id="inputGivenAmount"
-            v-model="amountInput"
-            type="number"
-            class="flex-1 border border-e-0 border-slate-400 px-2 py-2 text-center w-[1px]"
-          />
-          <button
-            class="rounded-e border border-slate-400 bg-slate-200 px-4 py-2"
-            @click="increment()"
-          >
-            <font-awesome icon="chevron-right" />
-          </button>
-
-          <select
-            v-model="unitCode"
-            class="flex-1 rounded border border-slate-400 ms-2 px-3 py-2"
-          >
-            <option value="HUR">Hours</option>
-            <option value="USD">US $</option>
-            <option value="BTC">BTC</option>
-            <option value="BX">BX</option>
-            <option value="ETH">ETH</option>
-          </select>
-        </div>
-        <router-link
-          :to="{
-            name: 'gifted-details',
-            query: giftedDetailsQuery,
-          }"
-          class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-lg mb-4"
-        >
-          Photo &amp; more options&hellip;
-        </router-link>
-        <p class="text-center text-sm mb-4">
-          <b class="font-medium">Sign &amp; Send</b> to publish to the world
-          <font-awesome
-            icon="circle-info"
-            class="fa-fw text-blue-500 text-base cursor-pointer"
-            @click="explainData()"
-          />
-        </p>
-        
-        <!-- Conflict warning -->
-        <div v-if="hasPersonConflict" class="mb-4 p-3 bg-red-50 border border-red-200 rounded-md">
-          <p class="text-red-700 text-sm text-center">
-            <font-awesome icon="exclamation-triangle" class="fa-fw mr-1" />
-            Cannot record: Same person selected as both giver and recipient
-          </p>
-        </div>
-        
-        <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
-          <button
-            :disabled="hasPersonConflict"
-            :class="{
-              'block w-full text-center text-md uppercase font-bold bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-lg': !hasPersonConflict,
-              'block w-full text-center text-md uppercase font-bold bg-gradient-to-b from-slate-300 to-slate-500 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-slate-400 px-1.5 py-2 rounded-lg cursor-not-allowed': hasPersonConflict
-            }"
-            @click="confirm"
-          >
-            Sign &amp; Send
-          </button>
-          <button
-            class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-lg"
-            @click="cancel"
-          >
-            Cancel
-          </button>
-        </div>
-      </div>
    </div>
  </div>
 </template>

 <script lang="ts">
-import { Vue, Component, Prop, Watch } from "vue-facing-decorator";
+import { Vue, Component, Prop } from "vue-facing-decorator";

 import { NotificationIface, USE_DEXIE_DB } from "../constants/app";
 import {
  createAndSubmitGive,
  didInfo,
  serverMessageForUser,
-  getHeaders,
 } from "../libs/endorserServer";
 import * as libsUtil from "../libs/util";
 import { db, retrieveSettingsForActiveAccount } from "../db/index";
@@ -480,38 +102,13 @@ import * as databaseUtil from "../db/databaseUtil";
 import { retrieveAccountDids } from "../libs/util";
 import { logger } from "../utils/logger";
 import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
-import EntityIcon from "../components/EntityIcon.vue";
-import ProjectIcon from "../components/ProjectIcon.vue";
-import { PlanData } from "../interfaces/records";

-@Component({
-  components: {
-    EntityIcon,
-    ProjectIcon,
-  },
-})
+@Component
 export default class GiftedDialog extends Vue {
  $notify!: (notification: NotificationIface, timeout?: number) => void;

  @Prop() fromProjectId = "";
  @Prop() toProjectId = "";
-  @Prop({ default: false }) showProjects = false;
-  @Prop() isFromProjectView = false;
-
-  @Watch("showProjects")
-  onShowProjectsChange() {
-    this.updateEntityTypes();
-  }
-
-  @Watch("fromProjectId")
-  onFromProjectIdChange() {
-    this.updateEntityTypes();
-  }
-
-  @Watch("toProjectId")
-  onToProjectIdChange() {
-    this.updateEntityTypes();
-  }

  activeDid = "";
  allContacts: Array<Contact> = [];
@@ -528,84 +125,9 @@ export default class GiftedDialog extends Vue {
  receiver?: libsUtil.GiverReceiverInputInfo;
  unitCode = "HUR";
  visible = false;
-  currentStep = 1;

  libsUtil = libsUtil;

-  projects: PlanData[] = [];
-
-  didInfo = didInfo;
-
-  // Computed property to help debug template logic
-  get shouldShowProjects() {
-    const result =
-      (this.stepType === "giver" && this.giverEntityType === "project") ||
-      (this.stepType === "recipient" && this.recipientEntityType === "project");
-    return result;
-  }
-
-  // Computed property to check if current selection would create a conflict
-  get hasPersonConflict() {
-    // Only check for conflicts when both entities are persons
-    if (this.giverEntityType !== "person" || this.recipientEntityType !== "person") {
-      return false;
-    }
-    
-    // Check if giver and recipient are the same person
-    if (this.giver?.did && this.receiver?.did && this.giver.did === this.receiver.did) {
-      return true;
-    }
-    
-    return false;
-  }
-
-  // Computed property to check if a contact would create a conflict when selected
-  wouldCreateConflict(contactDid: string) {
-    // Only check for conflicts when both entities are persons
-    if (this.giverEntityType !== "person" || this.recipientEntityType !== "person") {
-      return false;
-    }
-    
-    if (this.stepType === "giver") {
-      // If selecting as giver, check if it conflicts with current recipient
-      return this.receiver?.did === contactDid;
-    } else if (this.stepType === "recipient") {
-      // If selecting as recipient, check if it conflicts with current giver
-      return this.giver?.did === contactDid;
-    }
-    
-    return false;
-  }
-
-  stepType = "giver";
-  giverEntityType = "person" as "person" | "project";
-  recipientEntityType = "person" as "person" | "project";
-
-  updateEntityTypes() {
-    // Reset and set entity types based on current context
-    this.giverEntityType = "person";
-    this.recipientEntityType = "person";
-
-    // Determine entity types based on current context
-    if (this.showProjects) {
-      // HomeView "Project" button or ProjectViewView "Given by This"
-      this.giverEntityType = "project";
-      this.recipientEntityType = "person";
-    } else if (this.fromProjectId) {
-      // ProjectViewView "Given by This" button (project is giver)
-      this.giverEntityType = "project";
-      this.recipientEntityType = "person";
-    } else if (this.toProjectId) {
-      // ProjectViewView "Given to This" button (project is recipient)
-      this.giverEntityType = "person";
-      this.recipientEntityType = "project";
-    } else {
-      // HomeView "Person" button
-      this.giverEntityType = "person";
-      this.recipientEntityType = "person";
-    }
-  }
-
  async open(
    giver?: libsUtil.GiverReceiverInputInfo,
    receiver?: libsUtil.GiverReceiverInputInfo,
@@ -618,14 +140,10 @@ export default class GiftedDialog extends Vue {
    this.giver = giver;
    this.prompt = prompt || "";
    this.receiver = receiver;
+    // if we show "given to user" selection, default checkbox to true
    this.amountInput = "0";
    this.callbackOnSuccess = callbackOnSuccess;
    this.offerId = offerId || "";
-    this.currentStep = giver ? 2 : 1;
-    this.stepType = "giver";
-
-    // Update entity types based on current props
-    this.updateEntityTypes();

    try {
      let settings = await databaseUtil.retrieveSettingsForActiveAccount();
@@ -656,16 +174,7 @@ export default class GiftedDialog extends Vue {
          this.allContacts,
        );
      }
-
-      if (
-        this.giverEntityType === "project" ||
-        this.recipientEntityType === "project"
-      ) {
-        await this.loadProjects();
-      } else {
-        // Clear projects array when not needed
-        this.projects = [];
-      }
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
    } catch (err: any) {
      logger.error("Error retrieving settings from database:", err);
      this.$notify(
@@ -715,7 +224,6 @@ export default class GiftedDialog extends Vue {
    this.amountInput = "0";
    this.prompt = "";
    this.unitCode = "HUR";
-    this.currentStep = 1;
  }

  async confirm() {
@@ -758,20 +266,6 @@ export default class GiftedDialog extends Vue {
      return;
    }

-    // Check for person conflict
-    if (this.hasPersonConflict) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "You cannot select the same person as both giver and recipient.",
-        },
-        3000,
-      );
-      return;
-    }
-
    this.close();
    this.$notify(
      {
@@ -810,46 +304,20 @@ export default class GiftedDialog extends Vue {
    unitCode: string = "HUR",
  ) {
    try {
-      // Determine the correct parameters based on entity types
-      let fromDid: string | undefined;
-      let toDid: string | undefined;
-      let fulfillsProjectHandleId: string | undefined;
-      let providerPlanHandleId: string | undefined;
-
-      if (this.giverEntityType === "project" && this.recipientEntityType === "person") {
-        // Project-to-person gift
-        fromDid = undefined; // No person giver
-        toDid = recipientDid as string; // Person recipient
-        fulfillsProjectHandleId = undefined; // No project recipient
-        providerPlanHandleId = this.giver?.handleId; // Project giver
-      } else if (this.giverEntityType === "person" && this.recipientEntityType === "project") {
-        // Person-to-project gift
-        fromDid = giverDid as string; // Person giver
-        toDid = undefined; // No person recipient
-        fulfillsProjectHandleId = this.toProjectId; // Project recipient
-        providerPlanHandleId = undefined; // No project giver
-      } else {
-        // Person-to-person gift
-        fromDid = giverDid as string;
-        toDid = recipientDid as string;
-        fulfillsProjectHandleId = undefined;
-        providerPlanHandleId = undefined;
-      }
-
      const result = await createAndSubmitGive(
        this.axios,
        this.apiServer,
        this.activeDid,
-        fromDid,
-        toDid,
+        giverDid as string,
+        recipientDid as string,
        description,
        amount,
        unitCode,
-        fulfillsProjectHandleId,
+        this.toProjectId,
        this.offerId,
        false,
        undefined,
-        providerPlanHandleId,
+        this.fromProjectId,
      );

      if (!result.success) {
@@ -923,114 +391,6 @@ export default class GiftedDialog extends Vue {
      -1,
    );
  }
-
-  selectGiver(contact?: Contact) {
-    if (contact) {
-      this.giver = {
-        did: contact.did,
-        name: contact.name || contact.did,
-      };
-    } else {
-      this.giver = {
-        did: "",
-        name: "Unnamed",
-      };
-    }
-    this.currentStep = 2;
-  }
-
-  goBackToStep1(step: string) {
-    this.stepType = step;
-    this.currentStep = 1;
-  }
-
-  async loadProjects() {
-    try {
-      const response = await fetch(this.apiServer + "/api/v2/report/plans", {
-        method: "GET",
-        headers: await getHeaders(this.activeDid),
-      });
-
-      if (response.status !== 200) {
-        throw new Error("Failed to load projects");
-      }
-
-      const results = await response.json();
-      if (results.data) {
-        this.projects = results.data;
-      }
-    } catch (error) {
-      logger.error("Error loading projects:", error);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "Failed to load projects",
-        },
-        3000,
-      );
-    }
-  }
-
-  selectProject(project: PlanData) {
-    this.giver = {
-      did: project.handleId,
-      name: project.name,
-      image: project.image,
-      handleId: project.handleId,
-    };
-    this.receiver = {
-      did: this.activeDid,
-      name: "You",
-    };
-    this.currentStep = 2;
-  }
-
-  selectRecipient(contact?: Contact) {
-    if (contact) {
-      this.receiver = {
-        did: contact.did,
-        name: contact.name || contact.did,
-      };
-    } else {
-      this.receiver = {
-        did: "",
-        name: "Unnamed",
-      };
-    }
-    this.currentStep = 2;
-  }
-
-  selectRecipientProject(project: PlanData) {
-    this.receiver = {
-      did: project.handleId,
-      name: project.name,
-      image: project.image,
-      handleId: project.handleId,
-    };
-    this.currentStep = 2;
-  }
-
-  // Computed property for the query parameters
-  get giftedDetailsQuery() {
-    return {
-      amountInput: this.amountInput,
-      description: this.description,
-      giverDid: this.giverEntityType === "person" ? this.giver?.did : undefined,
-      giverName: this.giver?.name,
-      offerId: this.offerId,
-      fulfillsProjectId: this.giverEntityType === "person" && this.recipientEntityType === "project"
-        ? this.toProjectId
-        : undefined,
-      providerProjectId: this.giverEntityType === "project" && this.recipientEntityType === "person"
-        ? this.giver?.handleId
-        : this.fromProjectId,
-      recipientDid: this.receiver?.did,
-      recipientName: this.receiver?.name,
-      unitCode: this.unitCode,
-    };
-  }
 }
 </script>

--- a/src/components/GiftedPrompts.vue
+++ b/src/components/GiftedPrompts.vue
@@ -227,7 +227,6 @@ export default class GivenPrompts extends Vue {

    let someContactDbIndex = Math.floor(Math.random() * this.numContacts);
    let count = 0;
-
    // as long as the index has an entry, loop
    while (
      this.shownContactDbIndices[someContactDbIndex] != null &&
@@ -246,8 +245,9 @@ export default class GivenPrompts extends Vue {
        [someContactDbIndex],
      );
      if (result) {
-        const mappedContacts = databaseUtil.mapQueryResultToValues(result);
-        this.currentContact = mappedContacts[0] as unknown as Contact;
+        this.currentContact = databaseUtil.mapQueryResultToValues(result)[
+          someContactDbIndex
+        ] as unknown as Contact;
      }
      if (USE_DEXIE_DB) {
        await db.open();
--- a/src/components/OnboardingDialog.vue
+++ b/src/components/OnboardingDialog.vue
@@ -259,7 +259,7 @@ export default class OnboardingDialog extends Vue {
    this.visible = true;
    if (this.page === OnboardPage.Create) {
      // we'll assume that they've been through all the other pages
-      await databaseUtil.updateDidSpecificSettings(this.activeDid, {
+      await databaseUtil.updateAccountSettings(this.activeDid, {
        finishedOnboarding: true,
      });
      if (USE_DEXIE_DB) {
@@ -273,7 +273,7 @@ export default class OnboardingDialog extends Vue {
  async onClickClose(done?: boolean, goHome?: boolean) {
    this.visible = false;
    if (done) {
-      await databaseUtil.updateDidSpecificSettings(this.activeDid, {
+      await databaseUtil.updateAccountSettings(this.activeDid, {
        finishedOnboarding: true,
      });
      if (USE_DEXIE_DB) {
--- a/src/db/databaseUtil.ts
+++ b/src/db/databaseUtil.ts
@@ -37,20 +37,7 @@ export async function updateDefaultSettings(
  }
 }

-export async function insertDidSpecificSettings(
-  did: string,
-  settings: Partial<Settings> = {},
-): Promise<boolean> {
-  const platform = PlatformServiceFactory.getInstance();
-  const { sql, params } = generateInsertStatement(
-    { ...settings, accountDid: did }, // make sure accountDid is set to the given value
-    "settings",
-  );
-  const result = await platform.dbExec(sql, params);
-  return result.changes === 1;
-}
-
-export async function updateDidSpecificSettings(
+export async function updateAccountSettings(
  accountDid: string,
  settingsChanges: Settings,
 ): Promise<boolean> {
@@ -109,6 +96,9 @@ export async function retrieveSettingsForActiveAccount(): Promise<Settings> {
    const defaultSettings = await retrieveSettingsForDefaultAccount();
    // If no active DID, return defaults
    if (!defaultSettings.activeDid) {
+      logConsoleAndDb(
+        "[databaseUtil] No active DID found, returning default settings",
+      );
      return defaultSettings;
    }

@@ -121,29 +111,20 @@ export async function retrieveSettingsForActiveAccount(): Promise<Settings> {
      );

      if (!result?.values?.length) {
-        // we created DID-specific settings when generated or imported, so this shouldn't happen
+        logConsoleAndDb(
+          `[databaseUtil] No account-specific settings found for ${defaultSettings.activeDid}`,
+        );
        return defaultSettings;
      }

-      // Map and filter settings
+      // Map settings
      const overrideSettings = mapColumnsToValues(
        result.columns,
        result.values,
      )[0] as Settings;

-      const overrideSettingsFiltered = Object.fromEntries(
-        Object.entries(overrideSettings).filter(([_, v]) => v !== null),
-      );
-
-      // Merge settings
-      const settings = { ...defaultSettings, ...overrideSettingsFiltered };
-
-      // Handle searchBoxes parsing
-      if (settings.searchBoxes) {
-        settings.searchBoxes = parseJsonField(settings.searchBoxes, []);
-      }
-
-      return settings;
+      // Use the new mergeSettings function for consistency
+      return mergeSettings(defaultSettings, overrideSettings);
    } catch (error) {
      logConsoleAndDb(
        `[databaseUtil] Failed to retrieve account settings for ${defaultSettings.activeDid}: ${error}`,
@@ -240,7 +221,6 @@ export function generateInsertStatement(
  const values = Object.values(model).filter((value) => value !== undefined);
  const placeholders = values.map(() => "?").join(", ");
  const insertSql = `INSERT INTO ${tableName} (${columns.join(", ")}) VALUES (${placeholders})`;
-
  return {
    sql: insertSql,
    params: values,
@@ -314,113 +294,126 @@ export function mapColumnsToValues(
 }

 /**
- * Debug function to inspect raw settings data in the database
- * This helps diagnose issues with data corruption or malformed JSON
- * @param did Optional DID to inspect specific account settings
- * @author Matthew Raymer
+ * Retrieves settings for a specific account by DID
+ * @param accountDid - The DID of the account to retrieve settings for
+ * @returns Promise<Settings> Combined settings for the specified account
 */
-export async function debugSettingsData(did?: string): Promise<void> {
+export async function getSettingsForAccount(accountDid: string): Promise<Settings> {
  try {
+    // Get default settings first
+    const defaultSettings = await retrieveSettingsForDefaultAccount();
+    
+    // Get account-specific settings
    const platform = PlatformServiceFactory.getInstance();
-
-    // Get all settings records
-    const allSettings = await platform.dbQuery("SELECT * FROM settings");
-
-    logConsoleAndDb(
-      `[DEBUG] Total settings records: ${allSettings?.values?.length || 0}`,
-      false,
+    const result = await platform.dbQuery(
+      "SELECT * FROM settings WHERE accountDid = ?",
+      [accountDid],
    );

-    if (allSettings?.values?.length) {
-      allSettings.values.forEach((row, index) => {
-        const settings = mapColumnsToValues(allSettings.columns, [row])[0];
-        logConsoleAndDb(`[DEBUG] Settings record ${index + 1}:`, false);
-        logConsoleAndDb(`[DEBUG] - ID: ${settings.id}`, false);
-        logConsoleAndDb(`[DEBUG] - accountDid: ${settings.accountDid}`, false);
-        logConsoleAndDb(`[DEBUG] - activeDid: ${settings.activeDid}`, false);
-
-        if (settings.searchBoxes) {
-          logConsoleAndDb(
-            `[DEBUG] - searchBoxes type: ${typeof settings.searchBoxes}`,
-            false,
-          );
-          logConsoleAndDb(
-            `[DEBUG] - searchBoxes value: ${String(settings.searchBoxes)}`,
-            false,
-          );
-
-          // Try to parse it
-          try {
-            const parsed = JSON.parse(String(settings.searchBoxes));
-            logConsoleAndDb(
-              `[DEBUG] - searchBoxes parsed successfully: ${JSON.stringify(parsed)}`,
-              false,
-            );
-          } catch (parseError) {
-            logConsoleAndDb(
-              `[DEBUG] - searchBoxes parse error: ${parseError}`,
-              true,
-            );
-          }
-        }
-
-        logConsoleAndDb(
-          `[DEBUG] - Full record: ${JSON.stringify(settings, null, 2)}`,
-          false,
-        );
-      });
-    }
-
-    // If specific DID provided, also check accounts table
-    if (did) {
-      const account = await platform.dbQuery(
-        "SELECT * FROM accounts WHERE did = ?",
-        [did],
-      );
+    if (!result?.values?.length) {
      logConsoleAndDb(
-        `[DEBUG] Account for ${did}: ${JSON.stringify(account, null, 2)}`,
-        false,
+        `[databaseUtil] No account-specific settings found for ${accountDid}`,
      );
+      return defaultSettings;
    }
+
+    // Map and merge settings
+    const overrideSettings = mapColumnsToValues(
+      result.columns,
+      result.values,
+    )[0] as Settings;
+    
+    return mergeSettings(defaultSettings, overrideSettings);
  } catch (error) {
-    logConsoleAndDb(`[DEBUG] Error inspecting settings data: ${error}`, true);
+    logConsoleAndDb(
+      `[databaseUtil] Failed to retrieve settings for account ${accountDid}: ${error}`,
+      true,
+    );
+    // Return default settings on error
+    return await retrieveSettingsForDefaultAccount();
  }
 }

 /**
- * Platform-agnostic JSON parsing utility
- * Handles different SQLite implementations:
- * - Web SQLite (wa-sqlite/absurd-sql): Auto-parses JSON strings to objects
- * - Capacitor SQLite: Returns raw strings that need manual parsing
- *
- * @param value The value to parse (could be string or already parsed object)
- * @param defaultValue Default value if parsing fails
- * @returns Parsed object or default value
- * @author Matthew Raymer
+ * Retrieves only account-specific settings for a given DID (without merging with defaults)
+ * @param accountDid - The DID of the account to retrieve settings for
+ * @returns Promise<Settings> Account-specific settings only
 */
-export function parseJsonField<T>(value: unknown, defaultValue: T): T {
+export async function getAccountSpecificSettings(accountDid: string): Promise<Settings> {
  try {
-    // If already an object (web SQLite auto-parsed), return as-is
-    if (typeof value === "object" && value !== null) {
-      return value as T;
+    const platform = PlatformServiceFactory.getInstance();
+    const result = await platform.dbQuery(
+      "SELECT * FROM settings WHERE accountDid = ?",
+      [accountDid],
+    );
+
+    if (!result?.values?.length) {
+      logConsoleAndDb(
+        `[databaseUtil] No account-specific settings found for ${accountDid}`,
+      );
+      return {};
    }

-    // If it's a string (Capacitor SQLite or fallback), parse it
-    if (typeof value === "string") {
-      return JSON.parse(value) as T;
+    // Map settings
+    const settings = mapColumnsToValues(
+      result.columns,
+      result.values,
+    )[0] as Settings;
+
+    // Handle searchBoxes parsing
+    if (settings.searchBoxes) {
+      try {
+        // @ts-expect-error - the searchBoxes field is a string in the DB
+        settings.searchBoxes = JSON.parse(settings.searchBoxes);
+      } catch (error) {
+        logConsoleAndDb(
+          `[databaseUtil] Failed to parse searchBoxes for ${accountDid}: ${error}`,
+          true,
+        );
+        // Reset to empty array on parse failure
+        settings.searchBoxes = [];
+      }
    }

-    // If it's null/undefined, return default
-    if (value === null || value === undefined) {
-      return defaultValue;
-    }
-
-    return defaultValue;
+    return settings;
  } catch (error) {
    logConsoleAndDb(
-      `[databaseUtil] Failed to parse JSON field: ${error}`,
+      `[databaseUtil] Failed to retrieve account-specific settings for ${accountDid}: ${error}`,
      true,
    );
-    return defaultValue;
+    return {};
  }
 }
+
+/**
+ * Merges default settings with account-specific settings using consistent logic
+ * @param defaultSettings - The default/master settings
+ * @param accountSettings - The account-specific settings to merge
+ * @returns Settings - Merged settings with account-specific overrides
+ */
+export function mergeSettings(defaultSettings: Settings, accountSettings: Settings): Settings {
+  // Filter out null values from account settings
+  const accountSettingsFiltered = Object.fromEntries(
+    Object.entries(accountSettings).filter(([_, v]) => v !== null),
+  );
+
+  // Perform shallow merge (account settings override defaults)
+  const mergedSettings = { ...defaultSettings, ...accountSettingsFiltered };
+
+  // Handle searchBoxes parsing if present
+  if (mergedSettings.searchBoxes) {
+    try {
+      // @ts-expect-error - the searchBoxes field is a string in the DB
+      mergedSettings.searchBoxes = JSON.parse(mergedSettings.searchBoxes);
+    } catch (error) {
+      logConsoleAndDb(
+        `[databaseUtil] Failed to parse searchBoxes during merge: ${error}`,
+        true,
+      );
+      // Reset to empty array on parse failure
+      mergedSettings.searchBoxes = [];
+    }
+  }
+
+  return mergedSettings;
+}
--- a/src/db/index.ts
+++ b/src/db/index.ts
@@ -265,6 +265,43 @@ export async function retrieveSettingsForActiveAccount(): Promise<Settings> {
  }
 }

+/**
+ * Retrieves settings for a specific account by DID
+ * @param accountDid - The DID of the account to retrieve settings for
+ * @returns Promise<Settings> Combined settings for the specified account
+ */
+export async function getSettingsForAccount(accountDid: string): Promise<Settings> {
+  const defaultSettings = await retrieveSettingsForDefaultAccount();
+  const overrideSettings =
+    (await db.settings
+      .where("accountDid")
+      .equals(accountDid)
+      .first()) || {};
+  return R.mergeDeepRight(defaultSettings, overrideSettings);
+}
+
+/**
+ * Retrieves only account-specific settings for a given DID (without merging with defaults)
+ * @param accountDid - The DID of the account to retrieve settings for
+ * @returns Promise<Settings> Account-specific settings only
+ */
+export async function getAccountSpecificSettings(accountDid: string): Promise<Settings> {
+  return (await db.settings
+    .where("accountDid")
+    .equals(accountDid)
+    .first()) || {};
+}
+
+/**
+ * Merges default settings with account-specific settings using consistent logic
+ * @param defaultSettings - The default/master settings
+ * @param accountSettings - The account-specific settings to merge
+ * @returns Settings - Merged settings with account-specific overrides
+ */
+export function mergeSettings(defaultSettings: Settings, accountSettings: Settings): Settings {
+  return R.mergeDeepRight(defaultSettings, accountSettings);
+}
+
 export async function updateAccountSettings(
  accountDid: string,
  settingsChanges: Settings,
--- a/src/libs/fontawesome.ts
+++ b/src/libs/fontawesome.ts
@@ -29,7 +29,6 @@ import {
  faCircleCheck,
  faCircleInfo,
  faCircleQuestion,
-  faCircleRight,
  faCircleUser,
  faClock,
  faCoins,
@@ -61,7 +60,6 @@ import {
  faLightbulb,
  faLink,
  faLocationDot,
-  faLock,
  faLongArrowAltLeft,
  faLongArrowAltRight,
  faMagnifyingGlass,
@@ -81,7 +79,6 @@ import {
  faSquareCaretDown,
  faSquareCaretUp,
  faSquarePlus,
-  faThumbtack,
  faTrashCan,
  faTriangleExclamation,
  faUser,
@@ -114,7 +111,6 @@ library.add(
  faCircleCheck,
  faCircleInfo,
  faCircleQuestion,
-  faCircleRight,
  faCircleUser,
  faClock,
  faCoins,
@@ -146,7 +142,6 @@ library.add(
  faLightbulb,
  faLink,
  faLocationDot,
-  faLock,
  faLongArrowAltLeft,
  faLongArrowAltRight,
  faMagnifyingGlass,
@@ -166,7 +161,6 @@ library.add(
  faSquareCaretDown,
  faSquareCaretUp,
  faSquarePlus,
-  faThumbtack,
  faTrashCan,
  faTriangleExclamation,
  faUser,
--- a/src/libs/util.ts
+++ b/src/libs/util.ts
@@ -44,13 +44,10 @@ import { logger } from "../utils/logger";
 import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
 import { sha256 } from "ethereum-cryptography/sha256";
 import { IIdentifier } from "@veramo/core";
-import { insertDidSpecificSettings, parseJsonField } from "../db/databaseUtil";

 export interface GiverReceiverInputInfo {
  did?: string;
  name?: string;
-  image?: string;
-  handleId?: string;
 }

 export enum OnboardPage {
@@ -700,7 +697,6 @@ export async function saveNewIdentity(
    ];
    await platformService.dbExec(sql, params);
    await databaseUtil.updateDefaultSettings({ activeDid: identity.did });
-    await databaseUtil.insertDidSpecificSettings(identity.did);

    if (USE_DEXIE_DB) {
      // one of the few times we use accountsDBPromise directly; try to avoid more usage
@@ -714,7 +710,6 @@ export async function saveNewIdentity(
        publicKeyHex: identity.keys[0].publicKeyHex,
      });
      await updateDefaultSettings({ activeDid: identity.did });
-      await insertDidSpecificSettings(identity.did);
    }
  } catch (error) {
    logger.error("Failed to update default settings:", error);
@@ -737,9 +732,7 @@ export const generateSaveAndActivateIdentity = async (): Promise<string> => {
  const newId = newIdentifier(address, publicHex, privateHex, derivationPath);

  await saveNewIdentity(newId, mnemonic, derivationPath);
-  await databaseUtil.updateDidSpecificSettings(newId.did, {
-    isRegistered: false,
-  });
+  await databaseUtil.updateAccountSettings(newId.did, { isRegistered: false });
  if (USE_DEXIE_DB) {
    await updateAccountSettings(newId.did, { isRegistered: false });
  }
@@ -781,7 +774,7 @@ export const registerSaveAndActivatePasskey = async (
 ): Promise<Account> => {
  const account = await registerAndSavePasskey(keyName);
  await databaseUtil.updateDefaultSettings({ activeDid: account.did });
-  await databaseUtil.updateDidSpecificSettings(account.did, {
+  await databaseUtil.updateAccountSettings(account.did, {
    isRegistered: false,
  });
  if (USE_DEXIE_DB) {
@@ -869,7 +862,7 @@ export const contactToCsvLine = (contact: Contact): string => {

  // Handle contactMethods array by stringifying it
  const contactMethodsStr = contact.contactMethods
-    ? escapeField(JSON.stringify(parseJsonField(contact.contactMethods, [])))
+    ? escapeField(JSON.stringify(contact.contactMethods))
    : "";

  const fields = [
@@ -914,7 +907,7 @@ export const contactsToExportJson = (contacts: Contact[]): DatabaseExport => {
    did: contact.did,
    name: contact.name || null,
    contactMethods: contact.contactMethods
-      ? JSON.stringify(parseJsonField(contact.contactMethods, []))
+      ? JSON.stringify(contact.contactMethods)
      : null,
    nextPubKeyHashB64: contact.nextPubKeyHashB64 || null,
    notes: contact.notes || null,
--- a/src/views/AccountViewView.vue
+++ b/src/views/AccountViewView.vue
@@ -1814,7 +1814,7 @@ export default class AccountViewView extends Vue {
        if (!this.isRegistered) {
          // the user was not known to be registered, but now they are (because we got no error) so let's record it
          try {
-            await databaseUtil.updateDidSpecificSettings(did, {
+            await databaseUtil.updateAccountSettings(did, {
              isRegistered: true,
            });
            if (USE_DEXIE_DB) {
@@ -2018,7 +2018,7 @@ export default class AccountViewView extends Vue {
      if ((error as any).response.status === 404) {
        logger.error("The image was already deleted:", error);

-        await databaseUtil.updateDidSpecificSettings(this.activeDid, {
+        await databaseUtil.updateAccountSettings(this.activeDid, {
          profileImageUrl: undefined,
        });
        if (USE_DEXIE_DB) {
--- a/src/views/ContactEditView.vue
+++ b/src/views/ContactEditView.vue
@@ -138,13 +138,11 @@ import { RouteLocationNormalizedLoaded, Router } from "vue-router";

 import QuickNav from "../components/QuickNav.vue";
 import TopMessage from "../components/TopMessage.vue";
-import { NotificationIface, USE_DEXIE_DB } from "../constants/app";
-import * as databaseUtil from "../db/databaseUtil";
-import { parseJsonField } from "../db/databaseUtil";
+import { AppString, NotificationIface, USE_DEXIE_DB } from "../constants/app";
 import { db } from "../db/index";
-import { PlatformServiceFactory } from "../services/PlatformServiceFactory";
 import { Contact, ContactMethod } from "../db/tables/contacts";
-import { AppString } from "../constants/app";
+import * as databaseUtil from "../db/databaseUtil";
+import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";

 /**
 * Contact Edit View Component
@@ -232,7 +230,9 @@ export default class ContactEditView extends Vue {
    let contact: Contact | undefined = databaseUtil.mapQueryResultToValues(
      dbContact,
    )[0] as unknown as Contact;
-    contact.contactMethods = parseJsonField(contact?.contactMethods, []);
+    contact.contactMethods = JSON.parse(
+      (contact?.contactMethods as unknown as string) || "[]",
+    );
    if (USE_DEXIE_DB) {
      await db.open();
      contact = await db.contacts.get(contactDid || "");
--- a/src/views/ContactGiftingView.vue
+++ b/src/views/ContactGiftingView.vue
@@ -11,7 +11,7 @@
          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
          ><font-awesome icon="chevron-left" class="fa-fw"></font-awesome>
        </router-link>
-        {{ stepType === "giver" ? "Given by..." : "Given to..." }}
+        Given by...
      </h1>
    </div>

@@ -31,7 +31,7 @@
            <button
              type="button"
              class="block w-full text-center text-sm uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-3 py-1.5 rounded-md"
-              @click="openDialog('Unnamed')"
+              @click="openDialog()"
            >
              <font-awesome icon="gift" class="fa-fw"></font-awesome>
            </button>
@@ -65,13 +65,7 @@
      </li>
    </ul>

-    <GiftedDialog
-      ref="customDialog"
-      :from-project-id="fromProjectId"
-      :to-project-id="toProjectId"
-      :show-projects="showProjects"
-      :is-from-project-view="isFromProjectView"
-    />
+    <GiftedDialog ref="customDialog" :to-project-id="projectId" />
  </section>
 </template>

@@ -103,24 +97,6 @@ export default class ContactGiftingView extends Vue {
  description = "";
  projectId = "";
  prompt = "";
-  recipientProjectName = "";
-  recipientProjectImage = "";
-  recipientProjectHandleId = "";
-
-  // New context parameters
-  stepType = "giver";
-  giverEntityType = "person" as "person" | "project";
-  recipientEntityType = "person" as "person" | "project";
-  giverProjectId = "";
-  giverProjectName = "";
-  giverProjectImage = "";
-  giverProjectHandleId = "";
-  giverDid = "";
-  recipientDid = "";
-  fromProjectId = "";
-  toProjectId = "";
-  showProjects = false;
-  isFromProjectView = false;

  async created() {
    try {
@@ -148,41 +124,9 @@ export default class ContactGiftingView extends Vue {
        );
      }

-      this.projectId =
-        (this.$route.query["recipientProjectId"] as string) || "";
-      this.recipientProjectName =
-        (this.$route.query["recipientProjectName"] as string) || "";
-      this.recipientProjectImage =
-        (this.$route.query["recipientProjectImage"] as string) || "";
-      this.recipientProjectHandleId =
-        (this.$route.query["recipientProjectHandleId"] as string) || "";
+      this.projectId = (this.$route.query["projectId"] as string) || "";
      this.prompt = (this.$route.query["prompt"] as string) ?? this.prompt;

-      // Read new context parameters
-      this.stepType = (this.$route.query["stepType"] as string) || "giver";
-      this.giverEntityType =
-        (this.$route.query["giverEntityType"] as "person" | "project") ||
-        "person";
-      this.recipientEntityType =
-        (this.$route.query["recipientEntityType"] as "person" | "project") ||
-        "person";
-      this.giverProjectId =
-        (this.$route.query["giverProjectId"] as string) || "";
-      this.giverProjectName =
-        (this.$route.query["giverProjectName"] as string) || "";
-      this.giverProjectImage =
-        (this.$route.query["giverProjectImage"] as string) || "";
-      this.giverProjectHandleId =
-        (this.$route.query["giverProjectHandleId"] as string) || "";
-      this.giverDid = (this.$route.query["giverDid"] as string) || "";
-      this.recipientDid = (this.$route.query["recipientDid"] as string) || "";
-      this.fromProjectId = (this.$route.query["fromProjectId"] as string) || "";
-      this.toProjectId = (this.$route.query["toProjectId"] as string) || "";
-      this.showProjects =
-        (this.$route.query["showProjects"] as string) === "true";
-      this.isFromProjectView =
-        (this.$route.query["isFromProjectView"] as string) === "true";
-
      // eslint-disable-next-line @typescript-eslint/no-explicit-any
    } catch (err: any) {
      logger.error("Error retrieving settings & contacts:", err);
@@ -200,108 +144,17 @@ export default class ContactGiftingView extends Vue {
    }
  }

-  openDialog(contact?: GiverReceiverInputInfo | "Unnamed") {
-    if (contact === "Unnamed") {
-      // Special case: Pass undefined to trigger Step 1, but with "Unnamed" pre-selected
-      let recipient: GiverReceiverInputInfo;
-      let giver: GiverReceiverInputInfo | undefined;
-
-      if (this.stepType === "giver") {
-        // We're selecting a giver, so recipient is either a project or the current user
-        if (this.recipientEntityType === "project") {
-          recipient = {
-            did: this.recipientProjectHandleId,
-            name: this.recipientProjectName,
-            image: this.recipientProjectImage,
-            handleId: this.recipientProjectHandleId,
-          };
-        } else {
-          recipient = { did: this.activeDid, name: "You" };
-        }
-        giver = undefined; // Will be set to "Unnamed" in GiftedDialog
-      } else {
-        // We're selecting a recipient, so recipient is "Unnamed" and giver is preserved from context
-        recipient = { did: "", name: "Unnamed" };
-
-        // Preserve the existing giver from the context
-        if (this.giverEntityType === "project") {
-          giver = {
-            did: this.giverProjectHandleId,
-            name: this.giverProjectName,
-            image: this.giverProjectImage,
-            handleId: this.giverProjectHandleId,
-          };
-        } else if (this.giverDid) {
-          giver = {
-            did: this.giverDid,
-            name: this.giverProjectName || "Someone",
-          };
-        } else {
-          giver = { did: this.activeDid, name: "You" };
-        }
-      }
-
-      (this.$refs.customDialog as GiftedDialog).open(
-        giver,
-        recipient,
-        undefined,
-        this.stepType === "giver" ? "Given by Unnamed" : "Given to Unnamed",
-        this.prompt,
-      );
-      // Immediately select "Unnamed" and move to Step 2
-      (this.$refs.customDialog as GiftedDialog).selectGiver();
-    } else {
-      // Regular case: contact is a GiverReceiverInputInfo
-      let giver: GiverReceiverInputInfo;
-      let recipient: GiverReceiverInputInfo;
-
-      if (this.stepType === "giver") {
-        // We're selecting a giver, so the contact becomes the giver
-        giver = contact as GiverReceiverInputInfo; // Safe because we know contact is not "Unnamed" or undefined
-
-        // Recipient is either a project or the current user
-        if (this.recipientEntityType === "project") {
-          recipient = {
-            did: this.recipientProjectHandleId,
-            name: this.recipientProjectName,
-            image: this.recipientProjectImage,
-            handleId: this.recipientProjectHandleId,
-          };
-        } else {
-          recipient = { did: this.activeDid, name: "You" };
-        }
-      } else {
-        // We're selecting a recipient, so the contact becomes the recipient
-        recipient = contact as GiverReceiverInputInfo; // Safe because we know contact is not "Unnamed" or undefined
-
-        // Preserve the existing giver from the context
-        if (this.giverEntityType === "project") {
-          giver = {
-            did: this.giverProjectHandleId,
-            name: this.giverProjectName,
-            image: this.giverProjectImage,
-            handleId: this.giverProjectHandleId,
-          };
-        } else if (this.giverDid) {
-          giver = {
-            did: this.giverDid,
-            name: this.giverProjectName || "Someone",
-          };
-        } else {
-          giver = { did: this.activeDid, name: "You" };
-        }
-      }
-
-      (this.$refs.customDialog as GiftedDialog).open(
-        giver,
-        recipient,
-        undefined,
-        this.stepType === "giver"
-          ? "Given by " + (contact?.name || "someone not named")
-          : "Given to " + (contact?.name || "someone not named"),
-        this.prompt,
-      );
-    }
+  openDialog(giver?: GiverReceiverInputInfo) {
+    const recipient = this.projectId
+      ? undefined
+      : { did: this.activeDid, name: "you" };
+    (this.$refs.customDialog as GiftedDialog).open(
+      giver,
+      recipient,
+      undefined,
+      "Given by " + (giver?.name || "someone not named"),
+      this.prompt,
+    );
  }
 }
 </script>
--- a/src/views/ContactImportView.vue
+++ b/src/views/ContactImportView.vue
@@ -213,7 +213,6 @@ import {
 } from "../db/index";
 import { Contact, ContactMethod } from "../db/tables/contacts";
 import * as databaseUtil from "../db/databaseUtil";
-import { parseJsonField } from "../db/databaseUtil";
 import * as libsUtil from "../libs/util";
 import {
  capitalizeAndInsertSpacesBeforeCaps,
@@ -290,7 +289,7 @@ function dbRecordToContact(record: ContactDbRecord): Contact {
    profileImageUrl: safeString(record.profileImageUrl),
    publicKeyBase64: safeString(record.publicKeyBase64),
    nextPubKeyHashB64: safeString(record.nextPubKeyHashB64),
-    contactMethods: parseJsonField(record.contactMethods, []),
+    contactMethods: JSON.parse(record.contactMethods || "[]"),
  };
 }

--- a/src/views/ContactQRScanFullView.vue
+++ b/src/views/ContactQRScanFullView.vue
@@ -124,7 +124,6 @@ import UserNameDialog from "../components/UserNameDialog.vue";
 import { generateEndorserJwtUrlForAccount } from "../libs/endorserServer";
 import { retrieveAccountMetadata } from "../libs/util";
 import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
-import { parseJsonField } from "../db/databaseUtil";

 interface QRScanResult {
  rawValue?: string;
@@ -475,9 +474,7 @@ export default class ContactQRScan extends Vue {

      // Add new contact
      // @ts-expect-error because we're just using the value to store to the DB
-      contact.contactMethods = JSON.stringify(
-        parseJsonField(contact.contactMethods, []),
-      );
+      contact.contactMethods = JSON.stringify(contact.contactMethods);
      const { sql, params } = databaseUtil.generateInsertStatement(
        contact as unknown as Record<string, unknown>,
        "contacts",
--- a/src/views/ContactQRScanShowView.vue
+++ b/src/views/ContactQRScanShowView.vue
@@ -171,7 +171,6 @@ import { db, retrieveSettingsForActiveAccount } from "../db/index";
 import { Contact } from "../db/tables/contacts";
 import { MASTER_SETTINGS_KEY } from "../db/tables/settings";
 import * as databaseUtil from "../db/databaseUtil";
-import { parseJsonField } from "../db/databaseUtil";
 import { getContactJwtFromJwtUrl } from "../libs/crypto";
 import {
  generateEndorserJwtUrlForAccount,
@@ -779,9 +778,7 @@ export default class ContactQRScanShow extends Vue {

      // Add new contact
      // @ts-expect-error because we're just using the value to store to the DB
-      contact.contactMethods = JSON.stringify(
-        parseJsonField(contact.contactMethods, []),
-      );
+      contact.contactMethods = JSON.stringify(contact.contactMethods);
      const { sql, params } = databaseUtil.generateInsertStatement(
        contact as unknown as Record<string, unknown>,
        "contacts",
--- a/src/views/ContactsView.vue
+++ b/src/views/ContactsView.vue
@@ -78,7 +78,7 @@
        class="block w-full rounded-l border border-r-0 border-slate-400 px-3 py-2 h-10"
      />
      <button
-        class="px-4 rounded-r bg-green-200 border border-green-400"
+        class="px-4 rounded-r bg-green-200 border border-l-0 border-green-400"
        @click="onClickNewContact()"
      >
        <font-awesome icon="plus" class="fa-fw" />
@@ -86,8 +86,8 @@
    </div>

    <div v-if="contacts.length > 0" class="flex justify-between">
-      <div class="">
-        <div v-if="!showGiveNumbers" class="flex items-center">
+      <div class="w-full text-left">
+        <div v-if="!showGiveNumbers">
          <input
            type="checkbox"
            :checked="contactsSelected.length === contacts.length"
@@ -101,33 +101,52 @@
          />
          <button
            v-if="!showGiveNumbers"
-            :class="
+            href=""
+            class="text-md bg-gradient-to-b shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white ml-3 px-3 py-1.5 rounded-md"
+            :style="
              contactsSelected.length > 0
-                ? '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 ' +
-                  'ml-3 px-3 py-1.5 rounded-md cursor-pointer'
-                : 'text-md bg-gradient-to-b from-slate-400 to-slate-700 ' +
-                  'shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-slate-300 ' +
-                  'ml-3 px-3 py-1.5 rounded-md cursor-not-allowed'
+                ? 'background-image: linear-gradient(to bottom, #3b82f6, #1e40af);'
+                : 'background-image: linear-gradient(to bottom, #94a3b8, #374151);'
            "
            data-testId="copySelectedContactsButtonTop"
            @click="copySelectedContacts()"
          >
-            Copy
+            Copy Selections
+          </button>
+          <button @click="showCopySelectionsInfo()">
+            <font-awesome
+              icon="circle-info"
+              class="text-xl text-blue-500 ml-4"
+            />
          </button>
-          <font-awesome
-            icon="circle-info"
-            class="text-2xl text-blue-500 ml-2"
-            @click="showCopySelectionsInfo()"
-          />
        </div>
      </div>

-      <div class="flex items-center gap-2">
+      <div class="w-full text-right">
        <button
-          v-if="showGiveNumbers"
          href=""
-          class="text-md bg-gradient-to-b shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-3 py-1.5 rounded-md"
+          class="text-md 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-3 py-1.5 rounded-md"
+          @click="toggleShowContactAmounts()"
+        >
+          {{
+            showGiveNumbers ? "Hide Hours, Offer, etc" : "See Hours, Offer, etc"
+          }}
+        </button>
+      </div>
+    </div>
+    <div v-if="showGiveNumbers" class="flex justify-between mt-1">
+      <div class="w-full text-right">
+        In the following, only the most recent hours are included. To see more,
+        click
+        <span
+          class="text-sm uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1 py-1 rounded-md"
+        >
+          <font-awesome icon="file-lines" class="fa-fw" />
+        </span>
+        <br />
+        <button
+          href=""
+          class="text-md bg-gradient-to-b shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-1 rounded-md mt-1"
          :class="showGiveAmountsClassNames()"
          @click="toggleShowGiveTotals()"
        >
@@ -140,25 +159,6 @@
          }}
          <font-awesome icon="left-right" class="fa-fw" />
        </button>
-
-        <button
-          href=""
-          class="text-md 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-3 py-1.5 rounded-md"
-          @click="toggleShowContactAmounts()"
-        >
-          {{ showGiveNumbers ? "Hide Actions" : "See Actions" }}
-        </button>
-      </div>
-    </div>
-    <div v-if="showGiveNumbers" class="my-3">
-      <div class="w-full text-center text-sm italic text-slate-600">
-        Only the most recent hours are included. <br />To see more, click
-        <span
-          class="text-sm uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1 py-0.5 rounded"
-        >
-          <font-awesome icon="file-lines" class="text-xs fa-fw" />
-        </span>
-        <br />
      </div>
    </div>

@@ -166,7 +166,7 @@
    <ul
      v-if="contacts.length > 0"
      id="listContacts"
-      class="border-t border-slate-300 my-2"
+      class="border-t border-slate-300 mt-1"
    >
      <li
        v-for="contact in filteredContacts()"
@@ -174,125 +174,125 @@
        class="border-b border-slate-300 pt-1 pb-1"
        data-testId="contactListItem"
      >
-        <div class="flex items-center justify-between gap-3">
-          <div class="flex overflow-hidden min-w-0 items-center gap-3">
-            <input
-              v-if="!showGiveNumbers"
-              type="checkbox"
-              :checked="contactsSelected.includes(contact.did)"
-              class="ml-2 h-6 w-6 flex-shrink-0"
-              data-testId="contactCheckOne"
-              @click="
-                contactsSelected.includes(contact.did)
-                  ? contactsSelected.splice(
-                      contactsSelected.indexOf(contact.did),
-                      1,
-                    )
-                  : contactsSelected.push(contact.did)
-              "
-            />
+        <div class="grow overflow-hidden">
+          <div class="flex items-center justify-between gap-3">
+            <div class="flex items-center gap-3">
+              <input
+                v-if="!showGiveNumbers"
+                type="checkbox"
+                :checked="contactsSelected.includes(contact.did)"
+                class="ml-2 h-6 w-6 flex-shrink-0"
+                data-testId="contactCheckOne"
+                @click="
+                  contactsSelected.includes(contact.did)
+                    ? contactsSelected.splice(
+                        contactsSelected.indexOf(contact.did),
+                        1,
+                      )
+                    : contactsSelected.push(contact.did)
+                "
+              />

-            <EntityIcon
-              :contact="contact"
-              :icon-size="48"
-              class="shrink-0 align-text-bottom border border-slate-300 rounded cursor-pointer overflow-hidden"
-              @click="showLargeIdenticon = contact"
-            />
+              <div
+                class="flex-shrink-0 w-12 h-12 flex items-center justify-center"
+              >
+                <EntityIcon
+                  :contact="contact"
+                  :icon-size="48"
+                  class="inline-block align-text-bottom border border-slate-300 rounded cursor-pointer overflow-hidden"
+                  @click="showLargeIdenticon = contact"
+                />
+              </div>

-            <div class="overflow-hidden">
-              <h2 class="text-base font-semibold truncate">
-                <router-link
-                  :to="{
-                    path: '/did/' + encodeURIComponent(contact.did),
-                  }"
-                  title="See more about this person"
-                >
-                  {{ contactNameNonBreakingSpace(contact.name) }}
-                </router-link>
+              <h2 class="text-base font-semibold w-1/3 truncate flex-shrink-0">
+                {{ contactNameNonBreakingSpace(contact.name) }}
              </h2>

-              <div class="flex gap-1.5 items-center overflow-hidden">
-                <router-link
-                  :to="{
-                    path: '/did/' + encodeURIComponent(contact.did),
-                  }"
-                  title="See more about this person"
-                >
-                  <font-awesome
-                    icon="circle-info"
-                    class="text-base text-blue-500"
-                  />
-                </router-link>
+              <span>
+                <div class="flex gap-2 items-center">
+                  <router-link
+                    :to="{
+                      path: '/did/' + encodeURIComponent(contact.did),
+                    }"
+                    title="See more about this person"
+                  >
+                    <font-awesome
+                      icon="circle-info"
+                      class="text-xl text-blue-500"
+                    />
+                  </router-link>

-                <span class="text-xs truncate">{{ contact.did }}</span>
-              </div>
-              <div class="text-sm">
-                {{ contact.notes }}
-              </div>
-            </div>
-          </div>
-
-          <div
-            v-if="showGiveNumbers && contact.did != activeDid"
-            class="flex gap-1.5 items-end"
-          >
-            <div class="text-center">
-              <div class="text-xs leading-none mb-1">From/To</div>
-              <div class="flex items-center">
-                <button
-                  class="text-sm bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2.5 py-1.5 rounded-l-md"
-                  :title="givenToMeDescriptions[contact.did] || ''"
-                  @click="confirmShowGiftedDialog(contact.did, activeDid)"
-                >
-                  {{
-                    /* eslint-disable prettier/prettier */
-                    showGiveTotals
-                      ? ((givenToMeConfirmed[contact.did] || 0)
-                          + (givenToMeUnconfirmed[contact.did] || 0))
-                      : showGiveConfirmed
-                          ? (givenToMeConfirmed[contact.did] || 0)
-                          : (givenToMeUnconfirmed[contact.did] || 0)
-                    /* eslint-enable prettier/prettier */
-                  }}
-                </button>
-
-                <button
-                  class="text-sm bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2.5 py-1.5 rounded-r-md border-l"
-                  :title="givenByMeDescriptions[contact.did] || ''"
-                  @click="confirmShowGiftedDialog(activeDid, contact.did)"
-                >
-                  {{
-                    /* eslint-disable prettier/prettier */
-                    showGiveTotals
-                      ? ((givenByMeConfirmed[contact.did] || 0)
-                        + (givenByMeUnconfirmed[contact.did] || 0))
-                      : showGiveConfirmed
-                          ? (givenByMeConfirmed[contact.did] || 0)
-                          : (givenByMeUnconfirmed[contact.did] || 0)
-                    /* eslint-enable prettier/prettier */
-                  }}
-                </button>
-              </div>
+                  <span class="text-sm overflow-hidden">{{
+                    libsUtil.shortDid(contact.did)
+                  }}</span>
+                </div>
+                <div class="text-sm">
+                  {{ contact.notes }}
+                </div>
+              </span>
            </div>

-            <button
-              class="text-sm bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-1.5 rounded-md"
-              data-testId="offerButton"
-              @click="openOfferDialog(contact.did, contact.name)"
+            <div
+              v-if="showGiveNumbers && contact.did != activeDid"
+              class="flex gap-2 items-center"
            >
-              Offer
-            </button>
+              <button
+                class="text-sm bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-1.5 rounded-l-md"
+                :title="givenToMeDescriptions[contact.did] || ''"
+                @click="confirmShowGiftedDialog(contact.did, activeDid)"
+              >
+                From:
+                <br />
+                {{
+                  /* eslint-disable prettier/prettier */
+                  showGiveTotals
+                    ? ((givenToMeConfirmed[contact.did] || 0)
+                        + (givenToMeUnconfirmed[contact.did] || 0))
+                    : showGiveConfirmed
+                        ? (givenToMeConfirmed[contact.did] || 0)
+                        : (givenToMeUnconfirmed[contact.did] || 0)
+                  /* eslint-enable prettier/prettier */
+                }}
+              </button>

-            <router-link
-              :to="{
-                name: 'contact-amounts',
-                query: { contactDid: contact.did },
-              }"
-              class="text-sm 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-1.5 rounded-md"
-              title="See more given activity"
-            >
-              <font-awesome icon="file-lines" class="fa-fw" />
-            </router-link>
+              <button
+                class="text-sm bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white -ml-1.5 px-2 py-1.5 rounded-r-md border-l"
+                :title="givenByMeDescriptions[contact.did] || ''"
+                @click="confirmShowGiftedDialog(activeDid, contact.did)"
+              >
+                To:
+                <br />
+                {{
+                  /* eslint-disable prettier/prettier */
+                  showGiveTotals
+                    ? ((givenByMeConfirmed[contact.did] || 0)
+                      + (givenByMeUnconfirmed[contact.did] || 0))
+                    : showGiveConfirmed
+                        ? (givenByMeConfirmed[contact.did] || 0)
+                        : (givenByMeUnconfirmed[contact.did] || 0)
+                  /* eslint-enable prettier/prettier */
+                }}
+              </button>
+
+              <button
+                class="text-sm bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-1.5 rounded-md border border-blue-400"
+                data-testId="offerButton"
+                @click="openOfferDialog(contact.did, contact.name)"
+              >
+                Offer
+              </button>
+
+              <router-link
+                :to="{
+                  name: 'contact-amounts',
+                  query: { contactDid: contact.did },
+                }"
+                class="text-sm 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-1.5 rounded-md border border-slate-400"
+                title="See more given activity"
+              >
+                <font-awesome icon="file-lines" class="fa-fw" />
+              </router-link>
+            </div>
          </div>
        </div>
      </li>
@@ -314,18 +314,16 @@
      />
      <button
        v-if="!showGiveNumbers"
-        :class="
+        href=""
+        class="text-md bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white ml-3 px-3 py-1.5 rounded-md"
+        :style="
          contactsSelected.length > 0
-            ? '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 ' +
-              'ml-3 px-3 py-1.5 rounded-md cursor-pointer'
-            : 'text-md bg-gradient-to-b from-slate-400 to-slate-700 ' +
-              'shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-slate-300 ' +
-              'ml-3 px-3 py-1.5 rounded-md cursor-not-allowed'
+            ? 'background-image: linear-gradient(to bottom, #3b82f6, #1e40af);'
+            : 'background-image: linear-gradient(to bottom, #94a3b8, #374151);'
        "
        @click="copySelectedContacts()"
      >
-        Copy
+        Copy Selections
      </button>
    </div>

@@ -544,7 +542,7 @@ export default class ContactsView extends Vue {
        if (response.status != 201) {
          throw { error: { response: response } };
        }
-        await databaseUtil.updateDidSpecificSettings(this.activeDid, {
+        await databaseUtil.updateAccountSettings(this.activeDid, {
          isRegistered: true,
        });
        if (USE_DEXIE_DB) {
@@ -1000,6 +998,8 @@ export default class ContactsView extends Vue {
      newContact as unknown as Record<string, unknown>,
      "contacts",
    );
+    logger.error("sql", sql);
+    logger.error("params", params);
    let contactPromise = platformService.dbExec(sql, params);
    if (USE_DEXIE_DB) {
      // @ts-expect-error since the result of this promise won't be used, and this will go away soon
--- a/src/views/HelpView.vue
+++ b/src/views/HelpView.vue
@@ -622,7 +622,7 @@ export default class HelpView extends Vue {
    }

    if (settings.activeDid) {
-      await databaseUtil.updateDidSpecificSettings(settings.activeDid, {
+      await databaseUtil.updateAccountSettings(settings.activeDid, {
        finishedOnboarding: false,
      });
      if (USE_DEXIE_DB) {
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -117,73 +117,101 @@ Raymer * @version 1.0.0 */
          </div>

          <div v-else id="sectionRecordSomethingGiven">
-            <!-- Record Quick-Action -->
-            <div class="mb-6">
-              <div class="flex gap-2 items-center mb-2">
-                <h2 class="text-xl font-bold">Record something given by:</h2>
-                <button
-                  class="block ms-auto text-center text-white bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-2 rounded-full"
-                  @click="openGiftedPrompts()"
-                >
-                  <font-awesome
-                    icon="lightbulb"
-                    class="block text-center w-[1em]"
-                  />
-                </button>
-              </div>
+            <!-- !isCreatingIdentifier && isRegistered -->

-              <div class="grid grid-cols-2 gap-2">
-                <button
-                  type="button"
-                  class="text-center text-base uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-3 py-2 rounded-lg"
-                  @click="openDialogPerson()"
-                >
-                  <font-awesome icon="user" />
-                  Person
-                </button>
-                <button
-                  type="button"
-                  class="text-center text-base uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-3 py-2 rounded-lg"
-                  @click="openProjectDialog()"
-                >
-                  <font-awesome icon="folder-open" />
-                  Project
-                </button>
-              </div>
+            <!-- show the actions for recognizing a give -->
+            <div class="flex">
+              <h2 class="text-xl font-bold">What have you seen someone do?</h2>
+              <button
+                class="ml-2 block text-xs text-center bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1 rounded-md"
+                @click="openGiftedPrompts()"
+              >
+                <font-awesome icon="lightbulb" class="fa-fw" />
+              </button>
            </div>
+
+            <ul
+              class="grid grid-cols-4 sm:grid-cols-5 md:grid-cols-6 gap-x-3 gap-y-5 text-center mt-4"
+            >
+              <li @click="openDialog()">
+                <img
+                  src="../assets/blank-square.svg"
+                  class="mx-auto border border-blue-500 rounded-md mb-1 cursor-pointer"
+                />
+                <h3
+                  class="text-xs text-blue-500 italic font-medium text-ellipsis whitespace-nowrap overflow-hidden cursor-pointer"
+                >
+                  Unnamed/Unknown
+                </h3>
+              </li>
+              <li v-if="allContacts.length === 0" class="text-sm">
+                (Add friends to see more people worthy of recognition.)
+              </li>
+              <li
+                v-for="contact in allContacts.slice(0, 6)"
+                :key="contact.did"
+                @click="openDialog(contact)"
+              >
+                <EntityIcon
+                  :contact="contact"
+                  :icon-size="64"
+                  class="mx-auto border border-blue-500 rounded-md mb-1 cursor-pointer"
+                />
+                <h3
+                  class="text-xs text-blue-500 font-medium text-ellipsis whitespace-nowrap overflow-hidden cursor-pointer"
+                >
+                  {{ contact.name || contact.did }}
+                </h3>
+              </li>
+              <li>
+                <router-link
+                  v-if="allContacts.length >= 6"
+                  :to="{ name: 'contact-gift' }"
+                  class="flex align-bottom text-xs text-blue-500 mt-12 cursor-pointer"
+                >
+                  ... or someone else...
+                </router-link>
+              </li>
+            </ul>
          </div>
        </div>
      </div>
    </div>

-    <GiftedDialog ref="customDialog" :show-projects="showProjectsDialog" />
+    <GiftedDialog ref="customDialog" />
    <GiftedPrompts ref="giftedPrompts" />
    <FeedFilters ref="feedFilters" />

+    <div class="relative">
+      <button
+        v-if="isRegistered"
+        class="absolute right-6 bottom-0 transform translate-y-1/2 text-center text-4xl leading-none bg-green-600 text-white w-14 py-2.5 rounded-full"
+        @click="openDialog()"
+      >
+        <font-awesome icon="plus" class="fa-fw" />
+      </button>
+    </div>
+
    <!-- Results List -->
    <div class="mt-4 mb-4">
-      <div class="flex gap-2 items-center mb-3">
-        <h2 class="text-xl font-bold">Latest Activity</h2>
-        <button
-          v-if="resultsAreFiltered()"
-          class="block ms-auto text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-2 rounded-full"
-          @click="openFeedFilters()"
-        >
-          <font-awesome
-            icon="filter"
-            class="block text-center w-[1em] translate-y-[0.05em]"
-          />
-        </button>
-        <button
-          v-else
-          class="block ms-auto text-center text-white bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-2 rounded-full"
-          @click="openFeedFilters()"
-        >
-          <font-awesome
-            icon="filter"
-            class="block text-center w-[1em] translate-y-[0.05em]"
-          />
-        </button>
+      <div class="flex items-center mb-4">
+        <h2 class="text-xl font-bold flex items-center gap-4">
+          Latest Activity
+          <button
+            v-if="resultsAreFiltered()"
+            class="bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] px-3 py-1.5 rounded-md text-xs text-white"
+            @click="openFeedFilters()"
+          >
+            <font-awesome icon="filter" class="fa-fw" />
+          </button>
+          <button
+            v-else
+            class="bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] px-3 py-1.5 rounded-md text-xs text-white"
+            @click="openFeedFilters()"
+          >
+            <font-awesome icon="filter" class="fa-fw" />
+          </button>
+        </h2>
      </div>

      <div
@@ -446,7 +474,6 @@ export default class HomeView extends Vue {
  selectedImageData: Blob | null = null;
  isImageViewerOpen = false;
  imageCache: Map<string, Blob | null> = new Map();
-  showProjectsDialog = false;

  /**
   * Initializes the component on mount
@@ -603,7 +630,7 @@ export default class HomeView extends Vue {
            this.activeDid,
          );
          if (resp.status === 200) {
-            await databaseUtil.updateDidSpecificSettings(this.activeDid, {
+            await databaseUtil.updateAccountSettings(this.activeDid, {
              isRegistered: true,
              ...(await databaseUtil.retrieveSettingsForActiveAccount()),
            });
@@ -758,7 +785,7 @@ export default class HomeView extends Vue {
          if (USE_DEXIE_DB) {
            settings = await retrieveSettingsForActiveAccount();
          }
-          await databaseUtil.updateDidSpecificSettings(this.activeDid, {
+          await databaseUtil.updateAccountSettings(this.activeDid, {
            apiServer: this.apiServer,
            isRegistered: true,
            ...settings,
@@ -1610,33 +1637,17 @@ export default class HomeView extends Vue {
   * @param giver Optional contact info for giver
   * @param description Optional gift description
   */
-  openDialog(giver?: GiverReceiverInputInfo | "Unnamed", description?: string) {
-    if (giver === "Unnamed") {
-      // Special case: Pass undefined to trigger Step 1, but with "Unnamed" pre-selected
-      (this.$refs.customDialog as GiftedDialog).open(
-        undefined,
-        {
-          did: this.activeDid,
-          name: "You",
-        } as GiverReceiverInputInfo,
-        undefined,
-        "Given by Unnamed",
-        description,
-      );
-      // Immediately select "Unnamed" and move to Step 2
-      (this.$refs.customDialog as GiftedDialog).selectGiver();
-    } else {
-      (this.$refs.customDialog as GiftedDialog).open(
-        giver,
-        {
-          did: this.activeDid,
-          name: "You",
-        } as GiverReceiverInputInfo,
-        undefined,
-        "Given by " + (giver?.name || "someone not named"),
-        description,
-      );
-    }
+  openDialog(giver?: GiverReceiverInputInfo, description?: string) {
+    (this.$refs.customDialog as GiftedDialog).open(
+      giver,
+      {
+        did: this.activeDid,
+        name: "you",
+      } as GiverReceiverInputInfo,
+      undefined,
+      "Given by " + (giver?.name || "someone not named"),
+      description,
+    );
  }

  /**
@@ -1870,18 +1881,5 @@ export default class HomeView extends Vue {
      this.$router.push({ name: "contact-qr" });
    }
  }
-
-  openDialogPerson(
-    giver?: GiverReceiverInputInfo | "Unnamed",
-    description?: string,
-  ) {
-    this.showProjectsDialog = false;
-    this.openDialog(giver, description);
-  }
-
-  openProjectDialog() {
-    this.showProjectsDialog = true;
-    (this.$refs.customDialog as any).open();
-  }
 }
 </script>
--- a/src/views/ImportDerivedAccountView.vue
+++ b/src/views/ImportDerivedAccountView.vue
@@ -79,8 +79,7 @@ import {
  newIdentifier,
  nextDerivationPath,
 } from "../libs/crypto";
-import * as databaseUtil from "../db/databaseUtil";
-import { db } from "../db/index";
+import { accountsDBPromise, db } from "../db/index";
 import { MASTER_SETTINGS_KEY } from "../db/tables/settings";
 import {
  retrieveAllAccountsMetadata,
@@ -165,15 +164,23 @@ export default class ImportAccountView extends Vue {

    try {
      await saveNewIdentity(newId, mne, newDerivPath);
+      if (USE_DEXIE_DB) {
+        const accountsDB = await accountsDBPromise;
+        await accountsDB.accounts.add({
+          dateCreated: new Date().toISOString(),
+          derivationPath: newDerivPath,
+          did: newId.did,
+          identity: JSON.stringify(newId),
+          mnemonic: mne,
+          publicKeyHex: newId.keys[0].publicKeyHex,
+        });
+      }

      // record that as the active DID
      const platformService = PlatformServiceFactory.getInstance();
      await platformService.dbExec("UPDATE settings SET activeDid = ?", [
        newId.did,
      ]);
-      await databaseUtil.updateDidSpecificSettings(newId.did, {
-        isRegistered: false,
-      });
      if (USE_DEXIE_DB) {
        await db.settings.update(MASTER_SETTINGS_KEY, {
          activeDid: newId.did,
--- a/src/views/NewActivityView.vue
+++ b/src/views/NewActivityView.vue
@@ -257,7 +257,7 @@ export default class NewActivityView extends Vue {
  async expandOffersToUserAndMarkRead() {
    this.showOffersDetails = !this.showOffersDetails;
    if (this.showOffersDetails) {
-      await databaseUtil.updateDidSpecificSettings(this.activeDid, {
+      await databaseUtil.updateAccountSettings(this.activeDid, {
        lastAckedOfferToUserJwtId: this.newOffersToUser[0].jwtId,
      });
      if (USE_DEXIE_DB) {
@@ -285,7 +285,7 @@ export default class NewActivityView extends Vue {
    );
    if (index !== -1 && index < this.newOffersToUser.length - 1) {
      // Set to the next offer's jwtId
-      await databaseUtil.updateDidSpecificSettings(this.activeDid, {
+      await databaseUtil.updateAccountSettings(this.activeDid, {
        lastAckedOfferToUserJwtId: this.newOffersToUser[index + 1].jwtId,
      });
      if (USE_DEXIE_DB) {
@@ -295,7 +295,7 @@ export default class NewActivityView extends Vue {
      }
    } else {
      // it's the last entry (or not found), so just keep it the same
-      await databaseUtil.updateDidSpecificSettings(this.activeDid, {
+      await databaseUtil.updateAccountSettings(this.activeDid, {
        lastAckedOfferToUserJwtId: this.lastAckedOfferToUserJwtId,
      });
      if (USE_DEXIE_DB) {
@@ -319,7 +319,7 @@ export default class NewActivityView extends Vue {
    this.showOffersToUserProjectsDetails =
      !this.showOffersToUserProjectsDetails;
    if (this.showOffersToUserProjectsDetails) {
-      await databaseUtil.updateDidSpecificSettings(this.activeDid, {
+      await databaseUtil.updateAccountSettings(this.activeDid, {
        lastAckedOfferToUserProjectsJwtId:
          this.newOffersToUserProjects[0].jwtId,
      });
@@ -349,7 +349,7 @@ export default class NewActivityView extends Vue {
    );
    if (index !== -1 && index < this.newOffersToUserProjects.length - 1) {
      // Set to the next offer's jwtId
-      await databaseUtil.updateDidSpecificSettings(this.activeDid, {
+      await databaseUtil.updateAccountSettings(this.activeDid, {
        lastAckedOfferToUserProjectsJwtId:
          this.newOffersToUserProjects[index + 1].jwtId,
      });
@@ -361,7 +361,7 @@ export default class NewActivityView extends Vue {
      }
    } else {
      // it's the last entry (or not found), so just keep it the same
-      await databaseUtil.updateDidSpecificSettings(this.activeDid, {
+      await databaseUtil.updateAccountSettings(this.activeDid, {
        lastAckedOfferToUserProjectsJwtId:
          this.lastAckedOfferToUserProjectsJwtId,
      });
--- a/src/views/ProjectViewView.vue
+++ b/src/views/ProjectViewView.vue
@@ -196,11 +196,63 @@
      </div>
    </div>

-    <GiftedDialog
-      ref="giveDialogToThis"
-      :to-project-id="projectId"
-      :is-from-project-view="true"
-    />
+    <div v-if="activeDid && isRegistered">
+      <div class="text-center">
+        <p class="mt-2 mt-4 text-center">Record a contribution from:</p>
+      </div>
+      <ul
+        class="grid grid-cols-4 sm:grid-cols-5 md:grid-cols-6 gap-x-3 gap-y-5 text-center mb-5 mt-2"
+      >
+        <li @click="openGiftDialogToProject({ name: 'you', did: activeDid })">
+          <font-awesome
+            icon="hand"
+            class="fa-fw text-blue-500 text-5xl cursor-pointer"
+          />
+          <h3
+            class="mt-5 text-xs text-blue-500 font-medium text-ellipsis whitespace-nowrap overflow-hidden cursor-pointer"
+          >
+            You
+          </h3>
+        </li>
+        <li @click="openGiftDialogToProject()">
+          <img
+            src="../assets/blank-square.svg"
+            class="mx-auto border border-blue-300 rounded-md mb-1 cursor-pointer"
+          />
+          <h3
+            class="text-xs text-blue-500 italic font-medium text-ellipsis whitespace-nowrap overflow-hidden cursor-pointer"
+          >
+            Unnamed/Unknown
+          </h3>
+        </li>
+        <li
+          v-for="contact in allContacts.slice(0, 5)"
+          :key="contact.did"
+          @click="openGiftDialogToProject(contact)"
+        >
+          <EntityIcon
+            :contact="contact"
+            :icon-size="64"
+            class="mx-auto border border-blue-300 rounded-md mb-1 cursor-pointer"
+          />
+          <h3
+            class="text-xs text-blue-500 font-medium text-ellipsis whitespace-nowrap overflow-hidden cursor-pointer"
+          >
+            {{ contact.name || "(no name)" }}
+          </h3>
+        </li>
+        <li>
+          <span
+            v-if="allContacts.length >= 5"
+            class="flex align-bottom text-xs text-blue-500 mt-12 cursor-pointer"
+            @click="onClickAllContactsGifting()"
+          >
+            ... or someone else...
+          </span>
+        </li>
+      </ul>
+    </div>
+    <GiftedDialog ref="giveDialogToThis" :to-project-id="projectId" />

    <!-- Offers & Gifts to & from this -->
    <div class="grid items-start grid-cols-1 sm:grid-cols-3 gap-4 mt-4">
@@ -466,12 +518,7 @@
            </button>
          </div>
        </div>
-        <GiftedDialog
-          ref="giveDialogFromThis"
-          :from-project-id="projectId"
-          :show-projects="true"
-          :is-from-project-view="true"
-        />
+        <GiftedDialog ref="giveDialogFromThis" :from-project-id="projectId" />

        <h3 class="text-lg font-bold mb-3 mt-4">
          Benefitted From This Project
@@ -1182,53 +1229,21 @@ export default class ProjectViewView extends Vue {
    );
  }

-  openGiftDialogToProject(
-    contact?: libsUtil.GiverReceiverInputInfo | "Unnamed",
-  ) {
-    if (contact === "Unnamed") {
-      // Special case: Pass undefined to trigger Step 1, but with "Unnamed" pre-selected
-      (this.$refs.giveDialogToThis as GiftedDialog).open(
-        undefined,
-        undefined,
-        undefined,
-        "Given by Unnamed to this project",
-      );
-      // Immediately select "Unnamed" and move to Step 2
-      (this.$refs.giveDialogToThis as GiftedDialog).selectGiver();
-    } else {
-      // Open straight to Step 2 with current user as giver and current project as recipient
-      (this.$refs.giveDialogToThis as GiftedDialog).open(
-        {
-          did: this.activeDid,
-          name: "You",
-        },
-        {
-          did: this.issuer,
-          name: this.name,
-          handleId: this.projectId,
-          image: this.imageUrl,
-        },
-        undefined,
-        `Given to ${this.name}`,
-      );
-    }
+  openGiftDialogToProject(contact?: libsUtil.GiverReceiverInputInfo) {
+    (this.$refs.giveDialogToThis as GiftedDialog).open(
+      contact,
+      undefined,
+      undefined,
+      (contact?.name || "Someone not named") + ` gave to this project`,
+    );
  }

  openGiftDialogFromProject() {
-    // Set the project as giver and the current user as recipient
    (this.$refs.giveDialogFromThis as GiftedDialog).open(
-      {
-        did: undefined,
-        name: this.name,
-        handleId: this.projectId,
-        image: this.imageUrl,
-      },
+      undefined,
      { did: this.activeDid, name: "You" },
      undefined,
-      `${this.name} gave to you`,
-      undefined,
-      undefined,
-      true,
+      `This project gave to you`,
    );
  }

--- a/src/views/SearchAreaView.vue
+++ b/src/views/SearchAreaView.vue
@@ -215,7 +215,7 @@ export default class SearchAreaView extends Vue {
        if (USE_DEXIE_DB) {
          await db.open();
          await db.settings.update(MASTER_SETTINGS_KEY, {
-            searchBoxes: searchBoxes as unknown, // Type assertion for Dexie compatibility
+            searchBoxes: [newSearchBox],
          });
        }
        this.searchBox = newSearchBox;
@@ -269,7 +269,7 @@ export default class SearchAreaView extends Vue {
      if (USE_DEXIE_DB) {
        await db.open();
        await db.settings.update(MASTER_SETTINGS_KEY, {
-          searchBoxes: "[]" as unknown as string, // Type assertion for Dexie compatibility
+          searchBoxes: [],
          filterFeedByNearby: false,
        });
      }