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
54 changed files with 1319 additions and 1955 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -55,4 +55,3 @@ build_logs/
 icons


-android/app/src/main/res/
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -41,7 +41,6 @@ Install dependencies:
 1. Run the production build:

   ```bash
-   rm -rf dist
   npm run build:web
   ```

@@ -65,8 +64,6 @@ Install dependencies:

 * Commit everything (since the commit hash is used the app).

-* Run a build to make sure package-lock version is updated, linting works, etc: `npm install && npm run build`
-
 * Put the commit hash in the changelog (which will help you remember to bump the version later).

 * Tag with the new version, [online](https://gitea.anomalistdesign.com/trent_larson/crowd-funder-for-time-pwa/releases) or `git tag 0.3.55 && git push origin 0.3.55`.
@@ -74,7 +71,7 @@ Install dependencies:
 * For test, build the app (because test server is not yet set up to build):

 ```bash
-TIME_SAFARI_APP_TITLE="TimeSafari_Test" VITE_APP_SERVER=https://test.timesafari.app VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https://endorser.ch/entity/01HWE8FWHQ1YGP7GFZYYPS272F VITE_DEFAULT_ENDORSER_API_SERVER=https://test-api.endorser.ch VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app VITE_DEFAULT_PARTNER_API_SERVER=https://test-partner-api.endorser.ch VITE_DEFAULT_PUSH_SERVER=https://test.timesafari.app VITE_PASSKEYS_ENABLED=true npm run build:web
+TIME_SAFARI_APP_TITLE="TimeSafari_Test" VITE_APP_SERVER=https://test.timesafari.app VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https://endorser.ch/entity/01HWE8FWHQ1YGP7GFZYYPS272F VITE_DEFAULT_ENDORSER_API_SERVER=https://test-api.endorser.ch VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app VITE_DEFAULT_PARTNER_API_SERVER=https://test-partner-api.endorser.ch VITE_DEFAULT_PUSH_SERVER=https://test.timesafari.app VITE_PASSKEYS_ENABLED=true npm run build
 ```

   ... and transfer to the test server:
@@ -324,11 +321,11 @@ Prerequisites: macOS with Xcode installed

 #### Each Release

-0. First time (or if dependencies change):
+0. First time (or if XCode dependencies change):

  - `pkgx +rubygems.org sh`

-  - ... and you may have to fix these, especially with pkgx:
+  - ... and you may have to fix these, especially with pkgx

   ```bash
   gem_path=$(which gem)
@@ -337,12 +334,23 @@ Prerequisites: macOS with Xcode installed
   export GEM_PATH=$shortened_path
   ```

-1. Build the web assets & update ios:
+   ```bash
+   cd ios/App
+   pod install
+   ```
+
+1. Build the web assets:

   ```bash
   rm -rf dist
   npm run build:web
   npm run build:capacitor
+   ```
+
+
+2. Update iOS project with latest build:
+
+   ```bash
   npx cap sync ios
   ```

@@ -359,14 +367,15 @@ Prerequisites: macOS with Xcode installed
   npx capacitor-assets generate --ios
   ```

-4. Bump the version to match Android & package.json:
+4. Bump the version to match Android:

   ```
   cd ios/App
-   xcrun agvtool new-version 34
+   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.8;/g" > temp && mv temp App.xcodeproj/project.pbxproj
+   cat App.xcodeproj/project.pbxproj | sed "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 0.5.0;/g" > temp
+   mv temp App.xcodeproj/project.pbxproj
   cd -
   ```

@@ -418,7 +427,7 @@ Prerequisites: Android Studio with Java SDK installed
   npx capacitor-assets generate --android
   ```

-4. Bump version to match iOS & package.json: android/app/build.gradle
+4. Bump version to match iOS: android/app/build.gradle

 5. Open the project in Android Studio:

@@ -435,6 +444,7 @@ Prerequisites: Android Studio with Java SDK installed
   ./gradlew clean
   ./gradlew build -Dlint.baselines.continue=true
   cd -
+   npx cap run android
   ```

 ... or, to create the `aab` file, `bundle` instead of `build`:
@@ -468,7 +478,7 @@ At play.google.com/console:
 - Note that if you add testers, you have to go to "Publishing Overview" and send those changes or your (closed) testers won't see it.


-## Android Configuration for deep links
+## First-time Android Configuration for deep links

 You must add the following intent filter to the `android/app/src/main/AndroidManifest.xml` file:

@@ -480,5 +490,3 @@ You must add the following intent filter to the `android/app/src/main/AndroidMan
                  <data android:scheme="timesafari" />
               </intent-filter>
   ```
-
-... though when we tried that most recently it failed to 'build' the APK with: http(s) scheme and host attribute are missing, but are required for Android App Links [AppLinkUrlError]
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,13 +6,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).


-## [0.5.8]
-### Added
- /deep-link/ path for URLs that are shared with people
-### Changed
- External links now go to /deep-link/...
- Feed visuals now have arrow imagery from giver to receiver
-

 ## [0.4.7]
 ### Fixed
--- 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 34
-        versionName "0.5.8"
+        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/doc/DEEP_LINKS.md
+++ b/doc/DEEP_LINKS.md
@@ -100,7 +100,6 @@ try {
 - `src/interfaces/deepLinks.ts`: Type definitions and validation schemas
 - `src/services/deepLinks.ts`: Deep link processing service
 - `src/main.capacitor.ts`: Capacitor integration
- `src/views/DeepLinkRedirectView.vue`: Page to handle links to both mobile and web

 ## Type Safety Examples

--- 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 = 34;
+				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.8;
+				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 = 34;
+				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.8;
+				MARKETING_VERSION = 0.5.0;
 				PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
--- a/ios/App/App/Info.plist
+++ b/ios/App/App/Info.plist
@@ -49,16 +49,5 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<true/>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleURLName</key>
-			<string>app.timesafari</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>timesafari</string>
-			</array>
-		</dict>
-	</array>
 </dict>
 </plist>
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "timesafari",
-  "version": "0.5.8",
+  "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
@@ -321,7 +321,7 @@ export default class GiftedDialog extends Vue {
      );

      if (!result.success) {
-        const errorMessage = result.error;
+        const errorMessage = this.getGiveCreationErrorMessage(result);
        logger.error("Error with give creation result:", result);
        this.$notify(
          {
@@ -367,6 +367,19 @@ export default class GiftedDialog extends Vue {

  // Helper functions for readability

+  /**
+   * @param result direct response eg. ErrorResult or SuccessResult (potentially with embedded "data")
+   * @returns best guess at an error message
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  getGiveCreationErrorMessage(result: any) {
+    return (
+      result.error?.userMessage ||
+      result.error?.error ||
+      result.response?.data?.error?.message
+    );
+  }
+
  explainData() {
    this.$notify(
      {
--- 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/HiddenDidDialog.vue
+++ b/src/components/HiddenDidDialog.vue
@@ -48,15 +48,12 @@
                  <span>
                    {{ didInfo(visDid) }}
                    <span v-if="!serverUtil.isEmptyOrHiddenDid(visDid)">
-                      <router-link
-                        :to="{ path: '/did/' + encodeURIComponent(visDid) }"
-                        class="text-blue-500"
-                      >
+                      <a :href="`/did/${visDid}`" class="text-blue-500">
                        <font-awesome
                          icon="arrow-up-right-from-square"
                          class="fa-fw"
                        />
-                      </router-link>
+                      </a>
                    </span>
                  </span>
                </div>
@@ -77,7 +74,7 @@
            If you'd like an introduction,
            <a
              class="text-blue-500"
-              @click="copyToClipboard('A link to this page', deepLinkUrl)"
+              @click="copyToClipboard('A link to this page', windowLocation)"
              >click here to copy this page, paste it into a message, and ask if
              they'll tell you more about the {{ roleName }}.</a
            >
@@ -104,7 +101,7 @@ import * as R from "ramda";
 import { useClipboard } from "@vueuse/core";
 import { Contact } from "../db/tables/contacts";
 import * as serverUtil from "../libs/endorserServer";
-import { APP_SERVER, NotificationIface } from "../constants/app";
+import { NotificationIface } from "../constants/app";

@Component
 export default class HiddenDidDialog extends Vue {
@@ -117,8 +114,7 @@ export default class HiddenDidDialog extends Vue {
  activeDid = "";
  allMyDids: Array<string> = [];
  canShare = false;
-  deepLinkPathSuffix = "";
-  deepLinkUrl = window.location.href; // this is changed to a deep link in the setup
+  windowLocation = window.location.href;

  R = R;
  serverUtil = serverUtil;
@@ -130,21 +126,17 @@ export default class HiddenDidDialog extends Vue {
  }

  open(
-    deepLinkPathSuffix: string,
    roleName: string,
    visibleToDids: string[],
    allContacts: Array<Contact>,
    activeDid: string,
    allMyDids: Array<string>,
  ) {
-    this.deepLinkPathSuffix = deepLinkPathSuffix;
    this.roleName = roleName;
    this.visibleToDids = visibleToDids;
    this.allContacts = allContacts;
    this.activeDid = activeDid;
    this.allMyDids = allMyDids;
-
-    this.deepLinkUrl = APP_SERVER + "/deep-link/" + this.deepLinkPathSuffix;
    this.isOpen = true;
  }

@@ -178,11 +170,11 @@ export default class HiddenDidDialog extends Vue {
  }

  onClickShareClaim() {
-    this.copyToClipboard("A link to this page", this.deepLinkUrl);
+    this.copyToClipboard("A link to this page", this.windowLocation);
    window.navigator.share({
      title: "Help Connect Me",
      text: "I'm trying to find the people who recorded this. Can you help me?",
-      url: this.deepLinkUrl,
+      url: this.windowLocation,
    });
  }
 }
--- a/src/components/OfferDialog.vue
+++ b/src/components/OfferDialog.vue
@@ -83,7 +83,10 @@
 import { Vue, Component, Prop } from "vue-facing-decorator";

 import { NotificationIface, USE_DEXIE_DB } from "../constants/app";
-import { createAndSubmitOffer } from "../libs/endorserServer";
+import {
+  createAndSubmitOffer,
+  serverMessageForUser,
+} from "../libs/endorserServer";
 import * as libsUtil from "../libs/util";
 import * as databaseUtil from "../db/databaseUtil";
 import { retrieveSettingsForActiveAccount } from "../db/index";
@@ -247,7 +250,7 @@ export default class OfferDialog extends Vue {
      );

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

--- 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/components/TopMessage.vue
+++ b/src/components/TopMessage.vue
@@ -38,13 +38,14 @@ export default class TopMessage extends Vue {
        settings.apiServer !== AppString.PROD_ENDORSER_API_SERVER
      ) {
        const didPrefix = settings.activeDid?.slice(11, 15);
-        this.message = "You're not using prod, user " + didPrefix;
+        this.message = "You're linked to a non-prod server, user " + didPrefix;
      } else if (
        settings.warnIfProdServer &&
        settings.apiServer === AppString.PROD_ENDORSER_API_SERVER
      ) {
        const didPrefix = settings.activeDid?.slice(11, 15);
-        this.message = "You are using prod, user " + didPrefix;
+        this.message =
+          "You're linked to the production server, user " + didPrefix;
      }
    } catch (err: unknown) {
      this.$notify(
--- 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}`,
@@ -219,9 +200,9 @@ export async function logConsoleAndDb(
  isError = false,
 ): Promise<void> {
  if (isError) {
-    logger.error(`${new Date().toISOString()}`, message);
+    logger.error(`${new Date().toISOString()} ${message}`);
  } else {
-    logger.log(`${new Date().toISOString()}`, message);
+    logger.log(`${new Date().toISOString()} ${message}`);
  }
  await logToDb(message);
 }
@@ -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/interfaces/claims-result.ts
+++ b/src/interfaces/claims-result.ts
@@ -1,4 +1,6 @@
+import { AxiosResponse } from "axios";
 import { GiverReceiverInputInfo } from "../libs/util";
+import { ErrorResult, ResultWithType } from "./common";

 export interface GiverOutputInfo {
  action: string;
@@ -45,3 +47,12 @@ export interface ProviderInfo {
   */
  linkConfirmed: boolean;
 }
+
+// Type for createAndSubmitClaim result
+export type CreateAndSubmitClaimResult = SuccessResult | ErrorResult;
+
+// Update SuccessResult to use ClaimResult
+export interface SuccessResult extends ResultWithType {
+  type: "success";
+  response: AxiosResponse<ClaimResult>;
+}
--- a/src/interfaces/common.ts
+++ b/src/interfaces/common.ts
@@ -15,6 +15,10 @@ export interface GenericCredWrapper<T extends GenericVerifiableCredential> {
  publicUrls?: Record<string, string>;
 }

+export interface ResultWithType {
+  type: string;
+}
+
 export interface ErrorResponse {
  error?: {
    message?: string;
@@ -26,6 +30,11 @@ export interface InternalError {
  userMessage?: string;
 }

+export interface ErrorResult extends ResultWithType {
+  type: "error";
+  error: InternalError;
+}
+
 export interface KeyMeta {
  did: string;
  publicKeyHex: string;
--- a/src/interfaces/deepLinks.ts
+++ b/src/interfaces/deepLinks.ts
@@ -29,17 +29,18 @@ import { z } from "zod";

 // Add a union type of all valid route paths
 export const VALID_DEEP_LINK_ROUTES = [
-  // note that similar lists are below in deepLinkSchemas and in src/services/deepLinks.ts
-  "claim",
-  "claim-add-raw",
-  "claim-cert",
-  "confirm-gift",
-  "contact-import",
-  "did",
-  "invite-one-accept",
-  "onboard-meeting-setup",
-  "project",
  "user-profile",
+  "project-details",
+  "onboard-meeting-setup",
+  "invite-one-accept",
+  "contact-import",
+  "confirm-gift",
+  "claim",
+  "claim-cert",
+  "claim-add-raw",
+  "contact-edit",
+  "contacts",
+  "did",
 ] as const;

 // Create a type from the array
@@ -57,39 +58,44 @@ export const routeSchema = z.enum(VALID_DEEP_LINK_ROUTES);

 // Parameter validation schemas for each route type
 export const deepLinkSchemas = {
-  // note that similar lists are above in VALID_DEEP_LINK_ROUTES and in src/services/deepLinks.ts
+  "user-profile": z.object({
+    id: z.string(),
+  }),
+  "project-details": z.object({
+    id: z.string(),
+  }),
+  "onboard-meeting-setup": z.object({
+    id: z.string(),
+  }),
+  "invite-one-accept": z.object({
+    id: z.string(),
+  }),
+  "contact-import": z.object({
+    jwt: z.string(),
+  }),
+  "confirm-gift": z.object({
+    id: z.string(),
+  }),
  claim: z.object({
    id: z.string(),
  }),
+  "claim-cert": z.object({
+    id: z.string(),
+  }),
  "claim-add-raw": z.object({
    id: z.string(),
    claim: z.string().optional(),
    claimJwtId: z.string().optional(),
  }),
-  "claim-cert": z.object({
-    id: z.string(),
+  "contact-edit": z.object({
+    did: z.string(),
  }),
-  "confirm-gift": z.object({
-    id: z.string(),
-  }),
-  "contact-import": z.object({
-    jwt: z.string(),
+  contacts: z.object({
+    contacts: z.string(), // JSON string of contacts array
  }),
  did: z.object({
    did: z.string(),
  }),
-  "invite-one-accept": z.object({
-    jwt: z.string(),
-  }),
-  "onboard-meeting-setup": z.object({
-    id: z.string(),
-  }),
-  project: z.object({
-    id: z.string(),
-  }),
-  "user-profile": z.object({
-    id: z.string(),
-  }),
 };

 export type DeepLinkParams = {
--- a/src/interfaces/index.ts
+++ b/src/interfaces/index.ts
@@ -1,6 +1,5 @@
 export type {
  // From common.ts
-  CreateAndSubmitClaimResult,
  GenericCredWrapper,
  GenericVerifiableCredential,
  KeyMeta,
@@ -19,6 +18,11 @@ export type {
  RegisterActionClaim,
 } from "./claims";

+export type {
+  // From claims-result.ts
+  CreateAndSubmitClaimResult,
+} from "./claims-result";
+
 export type {
  // From records.ts
  PlanSummaryRecord,
--- a/src/libs/endorserServer.ts
+++ b/src/libs/endorserServer.ts
@@ -979,7 +979,7 @@ export const createAndSubmitConfirmation = async (
  handleId: string | undefined,
  apiServer: string,
  axios: Axios,
-): Promise<CreateAndSubmitClaimResult> => {
+) => {
  const goodClaim = removeSchemaContext(
    removeVisibleToDids(
      addLastClaimOrHandleAsIdIfMissing(claim, lastClaimId, handleId),
@@ -1074,8 +1074,7 @@ export async function generateEndorserJwtUrlForAccount(

  const vcJwt = await createEndorserJwtForDid(account.did, contactInfo);

-  const viewPrefix =
-    APP_SERVER + "/deep-link" + CONTACT_IMPORT_CONFIRM_URL_PATH_TIME_SAFARI;
+  const viewPrefix = APP_SERVER + CONTACT_IMPORT_CONFIRM_URL_PATH_TIME_SAFARI;
  return viewPrefix + vcJwt;
 }

--- a/src/libs/util.ts
+++ b/src/libs/util.ts
@@ -44,7 +44,6 @@ 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;
@@ -698,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
@@ -712,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);
@@ -735,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 });
  }
@@ -779,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) {
@@ -867,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 = [
@@ -882,71 +877,6 @@ export const contactToCsvLine = (contact: Contact): string => {
  return fields.join(",");
 };

-/**
- * Parses a CSV line into a Contact object. See contactToCsvLine for the format.
- * @param lineRaw - The CSV line to parse
- * @returns A Contact object
- */
-export const csvLineToContact = (lineRaw: string): Contact => {
-  // Note that Endorser Mobile puts name first, then did, etc.
-  let line = lineRaw.trim();
-  let did, publicKeyInput, seesMe, registered;
-  let name;
-  let commaPos1 = -1;
-  if (line.startsWith('"')) {
-    let doubleDoubleQuotePos = line.lastIndexOf('""') + 2;
-    if (doubleDoubleQuotePos === -1) {
-      doubleDoubleQuotePos = 1;
-    }
-    const quote2Pos = line.indexOf('"', doubleDoubleQuotePos);
-    if (quote2Pos > -1) {
-      commaPos1 = line.indexOf(",", quote2Pos);
-      name = line.substring(1, quote2Pos).trim();
-      name = name.replace(/""/g, '"');
-    } else {
-      // something is weird with one " to start, so ignore it and start after "
-      line = line.substring(1);
-      commaPos1 = line.indexOf(",");
-      name = line.substring(0, commaPos1).trim();
-    }
-  } else {
-    commaPos1 = line.indexOf(",");
-    name = line.substring(0, commaPos1).trim();
-  }
-  if (commaPos1 > -1) {
-    did = line.substring(commaPos1 + 1).trim();
-    const commaPos2 = line.indexOf(",", commaPos1 + 1);
-    if (commaPos2 > -1) {
-      did = line.substring(commaPos1 + 1, commaPos2).trim();
-      publicKeyInput = line.substring(commaPos2 + 1).trim();
-      const commaPos3 = line.indexOf(",", commaPos2 + 1);
-      if (commaPos3 > -1) {
-        publicKeyInput = line.substring(commaPos2 + 1, commaPos3).trim();
-        seesMe = line.substring(commaPos3 + 1).trim() == "true";
-        const commaPos4 = line.indexOf(",", commaPos3 + 1);
-        if (commaPos4 > -1) {
-          seesMe = line.substring(commaPos3 + 1, commaPos4).trim() == "true";
-          registered = line.substring(commaPos4 + 1).trim() == "true";
-        }
-      }
-    }
-  }
-  // help with potential mistakes while this sharing requires copy-and-paste
-  let publicKeyBase64 = publicKeyInput;
-  if (publicKeyBase64 && /^[0-9A-Fa-f]{66}$/i.test(publicKeyBase64)) {
-    // it must be all hex (compressed public key), so convert
-    publicKeyBase64 = Buffer.from(publicKeyBase64, "hex").toString("base64");
-  }
-  const newContact: Contact = {
-    did: did || "",
-    name,
-    publicKeyBase64,
-    seesMe,
-    registered,
-  };
-  return newContact;
-};
-
 /**
 * Interface for the JSON export format of database tables
 */
@@ -977,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/main.capacitor.ts
+++ b/src/main.capacitor.ts
@@ -34,7 +34,8 @@ import router from "./router";
 import { handleApiError } from "./services/api";
 import { AxiosError } from "axios";
 import { DeepLinkHandler } from "./services/deepLinks";
-import { logger, safeStringify } from "./utils/logger";
+import { logConsoleAndDb } from "./db/databaseUtil";
+import { logger } from "./utils/logger";

 logger.log("[Capacitor] Starting initialization");
 logger.log("[Capacitor] Platform:", process.env.VITE_PLATFORM);
@@ -71,10 +72,10 @@ const handleDeepLink = async (data: { url: string }) => {
    await router.isReady();
    await deepLinkHandler.handleDeepLink(data.url);
  } catch (error) {
-    logger.error("[DeepLink] Error handling deep link: ", error);
+    logConsoleAndDb("[DeepLink] Error handling deep link: " + error, true);
    handleApiError(
      {
-        message: error instanceof Error ? error.message : safeStringify(error),
+        message: error instanceof Error ? error.message : String(error),
      } as AxiosError,
      "deep-link",
    );
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -83,11 +83,6 @@ const routes: Array<RouteRecordRaw> = [
    name: "discover",
    component: () => import("../views/DiscoverView.vue"),
  },
-  {
-    path: "/deep-link/:path*",
-    name: "deep-link",
-    component: () => import("../views/DeepLinkRedirectView.vue"),
-  },
  {
    path: "/gifted-details",
    name: "gifted-details",
--- a/src/services/api.ts
+++ b/src/services/api.ts
@@ -6,7 +6,7 @@
 */

 import { AxiosError } from "axios";
-import { logger, safeStringify } from "../utils/logger";
+import { logger } from "../utils/logger";

 /**
 * Handles API errors with platform-specific logging and error processing.
@@ -37,8 +37,7 @@ import { logger, safeStringify } from "../utils/logger";
 */
 export const handleApiError = (error: AxiosError, endpoint: string) => {
  if (process.env.VITE_PLATFORM === "capacitor") {
-    const endpointStr = safeStringify(endpoint); // we've seen this as an object in deep links
-    logger.error(`[Capacitor API Error] ${endpointStr}:`, {
+    logger.error(`[Capacitor API Error] ${endpoint}:`, {
      message: error.message,
      status: error.response?.status,
      data: error.response?.data,
--- a/src/services/deepLinks.ts
+++ b/src/services/deepLinks.ts
@@ -27,16 +27,18 @@
 * timesafari://<route>[/<param>][?queryParam1=value1&queryParam2=value2]
 *
 * Supported Routes:
- * - claim: View claim
- * - claim-add-raw: Add raw claim
- * - claim-cert: View claim certificate
- * - confirm-gift
- * - contact-import: Import contacts
- * - did: View DID
- * - invite-one-accept: Accept invitation
- * - onboard-meeting-members
- * - project: View project details
 * - user-profile: View user profile
+ * - project-details: View project details
+ * - onboard-meeting-setup: Setup onboarding meeting
+ * - invite-one-accept: Accept invitation
+ * - contact-import: Import contacts
+ * - confirm-gift: Confirm gift
+ * - claim: View claim
+ * - claim-cert: View claim certificate
+ * - claim-add-raw: Add raw claim
+ * - contact-edit: Edit contact
+ * - contacts: View contacts
+ * - did: View DID
 *
 * @example
 * const handler = new DeepLinkHandler(router);
@@ -79,17 +81,18 @@ export class DeepLinkHandler {
    string,
    { name: string; paramKey?: string }
  > = {
-    // note that similar lists are in src/interfaces/deepLinks.ts
-    claim: { name: "claim" },
-    "claim-add-raw": { name: "claim-add-raw" },
-    "claim-cert": { name: "claim-cert" },
-    "confirm-gift": { name: "confirm-gift" },
-    "contact-import": { name: "contact-import", paramKey: "jwt" },
-    did: { name: "did", paramKey: "did" },
-    "invite-one-accept": { name: "invite-one-accept", paramKey: "jwt" },
-    "onboard-meeting-members": { name: "onboard-meeting-members" },
-    project: { name: "project" },
    "user-profile": { name: "user-profile" },
+    "project-details": { name: "project-details" },
+    "onboard-meeting-setup": { name: "onboard-meeting-setup" },
+    "invite-one-accept": { name: "invite-one-accept" },
+    "contact-import": { name: "contact-import" },
+    "confirm-gift": { name: "confirm-gift" },
+    claim: { name: "claim" },
+    "claim-cert": { name: "claim-cert" },
+    "claim-add-raw": { name: "claim-add-raw" },
+    "contact-edit": { name: "contact-edit", paramKey: "did" },
+    contacts: { name: "contacts" },
+    did: { name: "did", paramKey: "did" },
  };

  /**
@@ -98,7 +101,7 @@ export class DeepLinkHandler {
   *
   * @param url - The deep link URL to parse (format: scheme://path[?query])
   * @throws {DeepLinkError} If URL format is invalid
-   * @returns Parsed URL components (path: string, params: {KEY: string}, query: {KEY: string})
+   * @returns Parsed URL components (path, params, query)
   */
  private parseDeepLink(url: string) {
    const parts = url.split("://");
@@ -114,16 +117,7 @@ export class DeepLinkHandler {
    });

    const [path, queryString] = parts[1].split("?");
-    const [routePath, ...pathParams] = path.split("/");
-    // logger.info(
-    //   "[DeepLink] Debug:",
-    //   "Route Path:",
-    //   routePath,
-    //   "Path Params:",
-    //   pathParams,
-    //   "Query String:",
-    //   queryString,
-    // );
+    const [routePath, param] = path.split("/");

    // Validate route exists before proceeding
    if (!this.ROUTE_MAP[routePath]) {
@@ -142,14 +136,45 @@ export class DeepLinkHandler {
    }

    const params: Record<string, string> = {};
-    if (pathParams) {
+    if (param) {
      // Now we know routePath exists in ROUTE_MAP
      const routeConfig = this.ROUTE_MAP[routePath];
-      params[routeConfig.paramKey ?? "id"] = pathParams.join("/");
+      params[routeConfig.paramKey ?? "id"] = param;
    }
    return { path: routePath, params, query };
  }

+  /**
+   * Processes incoming deep links and routes them appropriately.
+   * Handles validation, error handling, and routing to the correct view.
+   *
+   * @param url - The deep link URL to process
+   * @throws {DeepLinkError} If URL processing fails
+   */
+  async handleDeepLink(url: string): Promise<void> {
+    try {
+      logConsoleAndDb("[DeepLink] Processing URL: " + url, false);
+      const { path, params, query } = this.parseDeepLink(url);
+      // Ensure params is always a Record<string,string> by converting undefined to empty string
+      const sanitizedParams = Object.fromEntries(
+        Object.entries(params).map(([key, value]) => [key, value ?? ""]),
+      );
+      await this.validateAndRoute(path, sanitizedParams, query);
+    } catch (error) {
+      const deepLinkError = error as DeepLinkError;
+      logConsoleAndDb(
+        `[DeepLink] Error (${deepLinkError.code}): ${deepLinkError.message}`,
+        true,
+      );
+
+      throw {
+        code: deepLinkError.code || "UNKNOWN_ERROR",
+        message: deepLinkError.message,
+        details: deepLinkError.details,
+      };
+    }
+  }
+
  /**
   * Routes the deep link to appropriate view with validated parameters.
   * Validates route and parameters using Zod schemas before routing.
@@ -220,39 +245,6 @@ export class DeepLinkHandler {
        code: "INVALID_PARAMETERS",
        message: (error as Error).message,
        details: error,
-        params: params,
-        query: query,
-      };
-    }
-  }
-
-  /**
-   * Processes incoming deep links and routes them appropriately.
-   * Handles validation, error handling, and routing to the correct view.
-   *
-   * @param url - The deep link URL to process
-   * @throws {DeepLinkError} If URL processing fails
-   */
-  async handleDeepLink(url: string): Promise<void> {
-    try {
-      logConsoleAndDb("[DeepLink] Processing URL: " + url, false);
-      const { path, params, query } = this.parseDeepLink(url);
-      // Ensure params is always a Record<string,string> by converting undefined to empty string
-      const sanitizedParams = Object.fromEntries(
-        Object.entries(params).map(([key, value]) => [key, value ?? ""]),
-      );
-      await this.validateAndRoute(path, sanitizedParams, query);
-    } catch (error) {
-      const deepLinkError = error as DeepLinkError;
-      logConsoleAndDb(
-        `[DeepLink] Error (${deepLinkError.code}): ${deepLinkError.message}`,
-        true,
-      );
-
-      throw {
-        code: deepLinkError.code || "UNKNOWN_ERROR",
-        message: deepLinkError.message,
-        details: deepLinkError.details,
      };
    }
  }
--- a/src/services/platforms/CapacitorPlatformService.ts
+++ b/src/services/platforms/CapacitorPlatformService.ts
@@ -5,7 +5,6 @@ import {
  CameraSource,
  CameraDirection,
 } from "@capacitor/camera";
-import { Capacitor } from "@capacitor/core";
 import { Share } from "@capacitor/share";
 import {
  SQLiteConnection,
@@ -248,7 +247,7 @@ export class CapacitorPlatformService implements PlatformService {
      hasFileSystem: true,
      hasCamera: true,
      isMobile: true,
-      isIOS: Capacitor.getPlatform() === "ios",
+      isIOS: /iPad|iPhone|iPod/.test(navigator.userAgent),
      hasFileDownload: false,
      needsFileHandlingInstructions: true,
      isNativeApp: true,
--- a/src/utils/logger.ts
+++ b/src/utils/logger.ts
@@ -1,6 +1,6 @@
 import { logToDb } from "../db/databaseUtil";

-export function safeStringify(obj: unknown) {
+function safeStringify(obj: unknown) {
  const seen = new WeakSet();

  return JSON.stringify(obj, (_key, value) => {
@@ -67,9 +67,8 @@ export const logger = {
    // Errors will always be logged
    // eslint-disable-next-line no-console
    console.error(message, ...args);
-    const messageString = safeStringify(message);
-    const argsString = args.length > 0 ? safeStringify(args) : "";
-    logToDb(messageString + argsString);
+    const argsString = args.length > 0 ? " - " + safeStringify(args) : "";
+    logToDb(message + argsString);
  },
 };

--- 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/ClaimAddRawView.vue
+++ b/src/views/ClaimAddRawView.vue
@@ -198,7 +198,7 @@ export default class ClaimAddRawView extends Vue {
      this.apiServer,
      this.axios,
    );
-    if (result.success) {
+    if (result.type === "success") {
      this.$notify(
        {
          group: "alert",
--- a/src/views/ClaimView.vue
+++ b/src/views/ClaimView.vue
@@ -46,35 +46,23 @@
            </h2>
            <div class="flex justify-center w-full">
              <router-link
-                v-if="veriClaim.id"
                :to="'/claim-cert/' + encodeURIComponent(veriClaim.id)"
                class="text-blue-500 mt-2"
-                title="View Printable Certificate"
+                title="Printable Certificate"
              >
                <font-awesome
                  icon="square"
                  class="text-white bg-yellow-500 p-1"
                />
              </router-link>
-              <button
-                v-if="veriClaim.id"
-                class="text-blue-500 ml-2 mt-2"
-                title="Copy Printable Certificate Link"
-                @click="
-                  copyToClipboard(
-                    'A link to the certificate page',
-                    `${APP_SERVER}/deep-link/claim-cert/${veriClaim.id}`,
-                  )
-                "
-              >
-                <font-awesome icon="link" class="text-yellow-500 p-1" />
-              </button>
            </div>
            <!-- show link icon to copy this URL to the clipboard -->
            <div class="flex justify-end w-full">
              <button
                title="Copy Link"
-                @click="copyToClipboard('A link to this page', windowDeepLink)"
+                @click="
+                  copyToClipboard('A link to this page', window.location.href)
+                "
              >
                <font-awesome icon="link" class="text-slate-500" />
              </button>
@@ -304,17 +292,12 @@
                  <div class="text-sm">
                    {{ didInfo(confirmerId) }}
                    <span v-if="!serverUtil.isEmptyOrHiddenDid(confirmerId)">
-                      <router-link
-                        :to="{
-                          path: '/did/' + encodeURIComponent(confirmerId),
-                        }"
-                        class="text-blue-500"
-                      >
+                      <a :href="`/did/${confirmerId}`" class="text-blue-500">
                        <font-awesome
                          icon="arrow-up-right-from-square"
                          class="fa-fw"
                        />
-                      </router-link>
+                      </a>
                    </span>
                  </div>
                </div>
@@ -346,17 +329,12 @@
                  <div class="text-sm">
                    {{ didInfo(confsVisibleTo) }}
                    <span v-if="!serverUtil.isEmptyOrHiddenDid(confsVisibleTo)">
-                      <router-link
-                        :to="{
-                          path: '/did/' + encodeURIComponent(confsVisibleTo),
-                        }"
-                        class="text-blue-500"
-                      >
+                      <a :href="`/did/${confsVisibleTo}`" class="text-blue-500">
                        <font-awesome
                          icon="arrow-up-right-from-square"
                          class="fa-fw"
                        />
-                      </router-link>
+                      </a>
                    </span>
                  </div>
                </div>
@@ -416,7 +394,7 @@
          contacts can see more details:
          <a
            class="text-blue-500"
-            @click="copyToClipboard('A link to this page', windowDeepLink)"
+            @click="copyToClipboard('A link to this page', windowLocation)"
            >click to copy this page info</a
          >
          and see if they can make an introduction. Someone is connected to
@@ -439,7 +417,7 @@
          If you'd like an introduction,
          <a
            class="text-blue-500"
-            @click="copyToClipboard('A link to this page', windowDeepLink)"
+            @click="copyToClipboard('A link to this page', windowLocation)"
            >share this page with them and ask if they'll tell you more about
            about the participants.</a
          >
@@ -465,17 +443,12 @@
                  <span>
                    {{ didInfo(visDid) }}
                    <span v-if="!serverUtil.isEmptyOrHiddenDid(visDid)">
-                      <router-link
-                        :to="{
-                          path: '/did/' + encodeURIComponent(visDid),
-                        }"
-                        class="text-blue-500"
-                      >
+                      <a :href="`/did/${visDid}`" class="text-blue-500">
                        <font-awesome
                          icon="arrow-up-right-from-square"
                          class="fa-fw"
                        />
-                      </router-link>
+                      </a>
                    </span>
                    <span v-if="veriClaim.publicUrls?.[visDid]"
                      >, found at&nbsp;<a
@@ -557,7 +530,7 @@ import { useClipboard } from "@vueuse/core";
 import { GenericVerifiableCredential } from "../interfaces";
 import GiftedDialog from "../components/GiftedDialog.vue";
 import QuickNav from "../components/QuickNav.vue";
-import { APP_SERVER, NotificationIface, USE_DEXIE_DB } from "../constants/app";
+import { NotificationIface, USE_DEXIE_DB } from "../constants/app";
 import * as databaseUtil from "../db/databaseUtil";
 import { db } from "../db/index";
 import { logConsoleAndDb } from "../db/databaseUtil";
@@ -604,9 +577,8 @@ export default class ClaimView extends Vue {
  veriClaim = serverUtil.BLANK_GENERIC_SERVER_RECORD;
  veriClaimDump = "";
  veriClaimDidsVisible: { [key: string]: string[] } = {};
-  windowDeepLink = window.location.href; // changed in the setup for deep linking
+  windowLocation = window.location.href;

-  APP_SERVER = APP_SERVER;
  R = R;
  yaml = yaml;
  libsUtil = libsUtil;
@@ -683,7 +655,6 @@ export default class ClaimView extends Vue {
        5000,
      );
    }
-    this.windowDeepLink = `${APP_SERVER}/deep-link/claim/${claimId}`;

    this.canShare = !!navigator.share;
  }
@@ -954,7 +925,7 @@ export default class ClaimView extends Vue {
      this.apiServer,
      this.axios,
    );
-    if (result.success) {
+    if (result.type === "success") {
      this.$notify(
        {
          group: "alert",
@@ -1019,11 +990,11 @@ export default class ClaimView extends Vue {
  }

  onClickShareClaim() {
-    this.copyToClipboard("A link to this page", this.windowDeepLink);
+    this.copyToClipboard("A link to this page", this.windowLocation);
    window.navigator.share({
      title: "Help Connect Me",
      text: "I'm trying to find the people who recorded this. Can you help me?",
-      url: this.windowDeepLink,
+      url: this.windowLocation,
    });
  }

--- a/src/views/ConfirmGiftView.vue
+++ b/src/views/ConfirmGiftView.vue
@@ -407,14 +407,14 @@
          </a>
        </div>
        <div class="mt-2 ml-2">
-          <router-link
+          <a
            v-if="isRegistered"
            class="text-blue-500 cursor-pointer"
-            :to="urlForNewGive"
+            :href="urlForNewGive"
          >
            <font-awesome icon="file-lines" />
            Record a Give Similar to the Original
-          </router-link>
+          </a>
        </div>
      </div>
    </div>
@@ -436,7 +436,7 @@ import { Component, Vue } from "vue-facing-decorator";
 import { useClipboard } from "@vueuse/core";
 import { RouteLocationNormalizedLoaded, Router } from "vue-router";
 import QuickNav from "../components/QuickNav.vue";
-import { APP_SERVER, NotificationIface, USE_DEXIE_DB } from "../constants/app";
+import { NotificationIface, USE_DEXIE_DB } from "../constants/app";
 import { db, retrieveSettingsForActiveAccount } from "../db/index";
 import { Contact } from "../db/tables/contacts";
 import * as databaseUtil from "../db/databaseUtil";
@@ -494,7 +494,7 @@ export default class ConfirmGiftView extends Vue {
  veriClaim = serverUtil.BLANK_GENERIC_SERVER_RECORD;
  veriClaimDump = "";
  veriClaimDidsVisible: { [key: string]: string[] } = {};
-  windowLocation = window.location.href; // this is changed to a deep link in the setup
+  windowLocation = window.location.href;

  R = R;
  yaml = yaml;
@@ -566,9 +566,6 @@ export default class ConfirmGiftView extends Vue {
    }

    const claimId = decodeURIComponent(pathParam);
-
-    this.windowLocation = APP_SERVER + "/deep-link/confirm-gift/" + claimId;
-
    await this.loadClaim(claimId, this.activeDid);
  }

@@ -679,12 +676,12 @@ export default class ConfirmGiftView extends Vue {
    /**
     * Add participant (giver/recipient) name & URL info
     */
-    this.giverName = this.didInfo(this.giveDetails?.agentDid);
    if (this.giveDetails?.agentDid) {
+      this.giverName = this.didInfo(this.giveDetails.agentDid);
      this.urlForNewGive += `&giverDid=${encodeURIComponent(this.giveDetails.agentDid)}&giverName=${encodeURIComponent(this.giverName)}`;
    }
-    this.recipientName = this.didInfo(this.giveDetails?.recipientDid);
    if (this.giveDetails?.recipientDid) {
+      this.recipientName = this.didInfo(this.giveDetails.recipientDid);
      this.urlForNewGive += `&recipientDid=${encodeURIComponent(this.giveDetails.recipientDid)}&recipientName=${encodeURIComponent(this.recipientName)}`;
    }

@@ -834,7 +831,7 @@ export default class ConfirmGiftView extends Vue {
      this.apiServer,
      this.axios,
    );
-    if (result.success) {
+    if (result.type === "success") {
      this.$notify(
        {
          group: "alert",
--- 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/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
@@ -104,7 +104,6 @@
 </template>

 <script lang="ts">
-import { Buffer } from "buffer/";
 import QRCodeVue3 from "qr-code-generator-vue3";
 import { Component, Vue } from "vue-facing-decorator";
 import { Router } from "vue-router";
@@ -118,20 +117,13 @@ import { db } from "../db/index";
 import { Contact } from "../db/tables/contacts";
 import { getContactJwtFromJwtUrl } from "../libs/crypto";
 import { decodeEndorserJwt, ETHR_DID_PREFIX } from "../libs/crypto/vc";
-import * as libsUtil from "../libs/util";
 import { retrieveSettingsForActiveAccount } from "../db/index";
 import * as databaseUtil from "../db/databaseUtil";
-import {
-  CONTACT_CSV_HEADER,
-  CONTACT_IMPORT_CONFIRM_URL_PATH_TIME_SAFARI,
-  generateEndorserJwtUrlForAccount,
-  setVisibilityUtil,
-} from "../libs/endorserServer";
+import { setVisibilityUtil } from "../libs/endorserServer";
 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";
-import { Account } from "@/db/tables/accounts";

 interface QRScanResult {
  rawValue?: string;
@@ -149,7 +141,7 @@ interface IUserNameDialog {
    UserNameDialog,
  },
 })
-export default class ContactQRScanFull extends Vue {
+export default class ContactQRScan extends Vue {
  $notify!: (notification: NotificationIface, timeout?: number) => void;
  $router!: Router;

@@ -158,8 +150,6 @@ export default class ContactQRScanFull extends Vue {
  activeDid = "";
  apiServer = "";
  givenName = "";
-  isRegistered = false;
-  profileImageUrl = "";
  qrValue = "";
  ETHR_DID_PREFIX = ETHR_DID_PREFIX;

@@ -181,22 +171,19 @@ export default class ContactQRScanFull extends Vue {
      this.activeDid = settings.activeDid || "";
      this.apiServer = settings.apiServer || "";
      this.givenName = settings.firstName || "";
-      this.isRegistered = !!settings.isRegistered;
-      this.profileImageUrl = settings.profileImageUrl || "";

      const account = await retrieveAccountMetadata(this.activeDid);
      if (account) {
        const name =
          (settings.firstName || "") +
          (settings.lastName ? ` ${settings.lastName}` : "");
-        const publicKeyBase64 = Buffer.from(
-          account.publicKeyHex,
-          "hex",
-        ).toString("base64");
-        this.qrValue =
-          CONTACT_CSV_HEADER +
-          "\n" +
-          `"${name}",${account.did},${publicKeyBase64},false,${this.isRegistered}`;
+        this.qrValue = await generateEndorserJwtUrlForAccount(
+          account,
+          !!settings.isRegistered,
+          name,
+          settings.profileImageUrl || "",
+          false,
+        );
      }
    } catch (error) {
      logger.error("Error initializing component:", {
@@ -348,69 +335,57 @@ export default class ContactQRScanFull extends Vue {

      logger.info("Processing QR code scan result:", rawValue);

-      let contact: Contact;
-      if (rawValue.includes(CONTACT_IMPORT_CONFIRM_URL_PATH_TIME_SAFARI)) {
-        // Extract JWT
-        const jwt = getContactJwtFromJwtUrl(rawValue);
-        if (!jwt) {
-          logger.warn("Invalid QR code format - no JWT found in URL");
-          this.$notify({
-            group: "alert",
-            type: "danger",
-            title: "Invalid QR Code",
-            text: "This QR code does not contain valid contact information. Scan a TimeSafari contact QR code.",
-          });
-          return;
-        }
-
-        // Process JWT and contact info
-        logger.info("Decoding JWT payload from QR code");
-        const decodedJwt = await decodeEndorserJwt(jwt);
-        if (!decodedJwt?.payload?.own) {
-          logger.warn("Invalid JWT payload - missing 'own' field");
-          this.$notify({
-            group: "alert",
-            type: "danger",
-            title: "Invalid Contact Info",
-            text: "The contact information is incomplete or invalid.",
-          });
-          return;
-        }
-
-        const contactInfo = decodedJwt.payload.own;
-        const did = contactInfo.did || decodedJwt.payload.iss;
-        if (!did) {
-          logger.warn("Invalid contact info - missing DID");
-          this.$notify({
-            group: "alert",
-            type: "danger",
-            title: "Invalid Contact",
-            text: "The contact DID is missing.",
-          });
-          return;
-        }
-
-        // Create contact object
-        contact = {
-          did: did,
-          name: contactInfo.name || "",
-          publicKeyBase64: contactInfo.publicKeyBase64 || "",
-          seesMe: contactInfo.seesMe || false,
-          registered: contactInfo.registered || false,
-        };
-      } else if (rawValue.startsWith(CONTACT_CSV_HEADER)) {
-        const lines = rawValue.split(/\n/);
-        contact = libsUtil.csvLineToContact(lines[1]);
-      } else {
+      // Extract JWT
+      const jwt = getContactJwtFromJwtUrl(rawValue);
+      if (!jwt) {
+        logger.warn("Invalid QR code format - no JWT found in URL");
        this.$notify({
          group: "alert",
          type: "danger",
-          title: "Error",
-          text: "Could not determine the type of contact info. Try again, or tap the QR code to copy it and send it to them.",
+          title: "Invalid QR Code",
+          text: "This QR code does not contain valid contact information. Please scan a TimeSafari contact QR code.",
        });
        return;
      }

+      // Process JWT and contact info
+      logger.info("Decoding JWT payload from QR code");
+      const decodedJwt = await decodeEndorserJwt(jwt);
+      if (!decodedJwt?.payload?.own) {
+        logger.warn("Invalid JWT payload - missing 'own' field");
+        this.$notify({
+          group: "alert",
+          type: "danger",
+          title: "Invalid Contact Info",
+          text: "The contact information is incomplete or invalid.",
+        });
+        return;
+      }
+
+      const contactInfo = decodedJwt.payload.own;
+      const did = contactInfo.did || decodedJwt.payload.iss;
+      if (!did) {
+        logger.warn("Invalid contact info - missing DID");
+        this.$notify({
+          group: "alert",
+          type: "danger",
+          title: "Invalid Contact",
+          text: "The contact DID is missing.",
+        });
+        return;
+      }
+
+      // Create contact object
+      const contact = {
+        did: did,
+        name: contactInfo.name || "",
+        email: contactInfo.email || "",
+        phone: contactInfo.phone || "",
+        company: contactInfo.company || "",
+        title: contactInfo.title || "",
+        notes: contactInfo.notes || "",
+      };
+
      // Add contact but keep scanning
      logger.info("Adding new contact to database:", {
        did: contact.did,
@@ -492,16 +467,14 @@ export default class ContactQRScanFull extends Vue {
            title: "Contact Exists",
            text: "This contact has already been added to your list.",
          },
-          5000,
+          3000,
        );
        return;
      }

      // 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",
@@ -592,19 +565,9 @@ export default class ContactQRScanFull extends Vue {
    );
  }

-  async onCopyUrlToClipboard() {
-    const account = (await libsUtil.retrieveFullyDecryptedAccount(
-      this.activeDid,
-    )) as Account;
-    const jwtUrl = await generateEndorserJwtUrlForAccount(
-      account,
-      this.isRegistered,
-      this.givenName,
-      this.profileImageUrl,
-      true,
-    );
+  onCopyUrlToClipboard() {
    useClipboard()
-      .copy(jwtUrl)
+      .copy(this.qrValue)
      .then(() => {
        this.$notify(
          {
--- a/src/views/ContactQRScanShowView.vue
+++ b/src/views/ContactQRScanShowView.vue
@@ -159,7 +159,6 @@

 <script lang="ts">
 import { AxiosError } from "axios";
-import { Buffer } from "buffer/";
 import QRCodeVue3 from "qr-code-generator-vue3";
 import { Component, Vue } from "vue-facing-decorator";
 import { useClipboard } from "@vueuse/core";
@@ -172,23 +171,19 @@ 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 {
-  CONTACT_CSV_HEADER,
-  CONTACT_IMPORT_CONFIRM_URL_PATH_TIME_SAFARI,
  generateEndorserJwtUrlForAccount,
  register,
  setVisibilityUtil,
 } from "../libs/endorserServer";
 import { decodeEndorserJwt, ETHR_DID_PREFIX } from "../libs/crypto/vc";
-import * as libsUtil from "../libs/util";
+import { retrieveAccountMetadata } from "../libs/util";
 import { Router } from "vue-router";
 import { logger } from "../utils/logger";
 import { QRScannerFactory } from "@/services/QRScanner/QRScannerFactory";
 import { CameraState } from "@/services/QRScanner/types";
 import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
-import { Account } from "@/db/tables/accounts";

 interface QRScanResult {
  rawValue?: string;
@@ -218,7 +213,6 @@ export default class ContactQRScanShow extends Vue {
  isRegistered = false;
  qrValue = "";
  isScanning = false;
-  profileImageUrl = "";
  error: string | null = null;

  // QR Scanner properties
@@ -256,21 +250,19 @@ export default class ContactQRScanShow extends Vue {
      this.hideRegisterPromptOnNewContact =
        !!settings.hideRegisterPromptOnNewContact;
      this.isRegistered = !!settings.isRegistered;
-      this.profileImageUrl = settings.profileImageUrl || "";

-      const account = await libsUtil.retrieveAccountMetadata(this.activeDid);
+      const account = await retrieveAccountMetadata(this.activeDid);
      if (account) {
        const name =
          (settings.firstName || "") +
          (settings.lastName ? ` ${settings.lastName}` : "");
-        const publicKeyBase64 = Buffer.from(
-          account.publicKeyHex,
-          "hex",
-        ).toString("base64");
-        this.qrValue =
-          CONTACT_CSV_HEADER +
-          "\n" +
-          `"${name}",${account.did},${publicKeyBase64},false,${this.isRegistered}`;
+        this.qrValue = await generateEndorserJwtUrlForAccount(
+          account,
+          !!settings.isRegistered,
+          name,
+          settings.profileImageUrl || "",
+          false,
+        );
      }
    } catch (error) {
      logger.error("Error initializing component:", {
@@ -281,7 +273,7 @@ export default class ContactQRScanShow extends Vue {
        group: "alert",
        type: "danger",
        title: "Initialization Error",
-        text: "Failed to initialize QR renderer or scanner. Please try again.",
+        text: "Failed to initialize QR scanner. Please try again.",
      });
    }
  }
@@ -468,68 +460,53 @@ export default class ContactQRScanShow extends Vue {

      logger.info("Processing QR code scan result:", rawValue);

-      let contact: Contact;
-      if (rawValue.includes(CONTACT_IMPORT_CONFIRM_URL_PATH_TIME_SAFARI)) {
-        const jwt = getContactJwtFromJwtUrl(rawValue);
-        if (!jwt) {
-          logger.warn("Invalid QR code format - no JWT found in URL");
-          this.$notify({
-            group: "alert",
-            type: "danger",
-            title: "Invalid QR Code",
-            text: "This QR code does not contain valid contact information. Scan a TimeSafari contact QR code.",
-          });
-          return;
-        }
-        logger.info("Decoding JWT payload from QR code");
-        const decodedJwt = await decodeEndorserJwt(jwt);
-
-        // Process JWT and contact info
-        if (!decodedJwt?.payload?.own) {
-          logger.warn("Invalid JWT payload - missing 'own' field");
-          this.$notify({
-            group: "alert",
-            type: "danger",
-            title: "Invalid Contact Info",
-            text: "The contact information is incomplete or invalid.",
-          });
-          return;
-        }
-
-        const contactInfo = decodedJwt.payload.own;
-        const did = contactInfo.did || decodedJwt.payload.iss;
-        if (!did) {
-          logger.warn("Invalid contact info - missing DID");
-          this.$notify({
-            group: "alert",
-            type: "danger",
-            title: "Invalid Contact",
-            text: "The contact DID is missing.",
-          });
-          return;
-        }
-
-        // Create contact object
-        contact = {
-          did: did,
-          name: contactInfo.name || "",
-          publicKeyBase64: contactInfo.publicKeyBase64 || "",
-          seesMe: contactInfo.seesMe || false,
-          registered: contactInfo.registered || false,
-        };
-      } else if (rawValue.startsWith(CONTACT_CSV_HEADER)) {
-        const lines = rawValue.split(/\n/);
-        contact = libsUtil.csvLineToContact(lines[1]);
-      } else {
+      // Extract JWT
+      const jwt = getContactJwtFromJwtUrl(rawValue);
+      if (!jwt) {
+        logger.warn("Invalid QR code format - no JWT found in URL");
        this.$notify({
          group: "alert",
          type: "danger",
-          title: "Error",
-          text: "Could not determine the type of contact info. Try again, or tap the QR code to copy it and send it to them.",
+          title: "Invalid QR Code",
+          text: "This QR code does not contain valid contact information. Please scan a TimeSafari contact QR code.",
        });
        return;
      }

+      // Process JWT and contact info
+      logger.info("Decoding JWT payload from QR code");
+      const decodedJwt = await decodeEndorserJwt(jwt);
+      if (!decodedJwt?.payload?.own) {
+        logger.warn("Invalid JWT payload - missing 'own' field");
+        this.$notify({
+          group: "alert",
+          type: "danger",
+          title: "Invalid Contact Info",
+          text: "The contact information is incomplete or invalid.",
+        });
+        return;
+      }
+
+      const contactInfo = decodedJwt.payload.own;
+      const did = contactInfo.did || decodedJwt.payload.iss;
+      if (!did) {
+        logger.warn("Invalid contact info - missing DID");
+        this.$notify({
+          group: "alert",
+          type: "danger",
+          title: "Invalid Contact",
+          text: "The contact DID is missing.",
+        });
+        return;
+      }
+
+      // Create contact object
+      const contact = {
+        did: did,
+        name: contactInfo.name || "",
+        notes: contactInfo.notes || "",
+      };
+
      // Add contact but keep scanning
      logger.info("Adding new contact to database:", {
        did: contact.did,
@@ -671,20 +648,12 @@ export default class ContactQRScanShow extends Vue {
    });
  }

-  async onCopyUrlToClipboard() {
-    const account = (await libsUtil.retrieveFullyDecryptedAccount(
-      this.activeDid,
-    )) as Account;
-    const jwtUrl = await generateEndorserJwtUrlForAccount(
-      account,
-      this.isRegistered,
-      this.givenName,
-      this.profileImageUrl,
-      true,
-    );
+  onCopyUrlToClipboard() {
+    //this.onScanDetect([{ rawValue: this.qrValue }]); // good for testing
    useClipboard()
-      .copy(jwtUrl)
+      .copy(this.qrValue)
      .then(() => {
+        // console.log("Contact URL:", this.qrValue);
        this.$notify(
          {
            group: "alert",
@@ -802,16 +771,14 @@ export default class ContactQRScanShow extends Vue {
            title: "Contact Exists",
            text: "This contact has already been added to your list.",
          },
-          5000,
+          3000,
        );
        return;
      }

      // 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,32 +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"
-          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"
+          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 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()"
        >
@@ -139,24 +159,6 @@
          }}
          <font-awesome icon="left-right" class="fa-fw" />
        </button>
-
-        <button
-          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>

@@ -164,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()"
@@ -172,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>
@@ -312,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>

@@ -491,7 +491,7 @@ export default class ContactsView extends Vue {
  private async processContactJwt() {
    // handle a contact sent via URL
    //
-    // For external links, use /deep-link/contact-import/:jwt with a JWT that has an array of contacts
+    // For external links, use /contact-import/:jwt with a JWT that has an array of contacts
    // because that will do better error checking for things like missing data on iOS platforms.
    const importedContactJwt = this.$route.query["contactJwt"] as string;
    if (importedContactJwt) {
@@ -542,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) {
@@ -617,7 +617,7 @@ export default class ContactsView extends Vue {
            title: "Error with Invite",
            text: message,
          },
-          -1,
+          5000,
        );
      }
      // if we're here, they haven't redirected anywhere, so we'll redirect here without a query parameter
@@ -933,9 +933,45 @@ export default class ContactsView extends Vue {
  }

  private async addContactFromEndorserMobileLine(
-    lineRaw: string,
+    line: string,
  ): Promise<IndexableType> {
-    const newContact = libsUtil.csvLineToContact(lineRaw);
+    // Note that Endorser Mobile puts name first, then did, etc.
+    let name = line;
+    let did = "";
+    let publicKeyInput, seesMe, registered;
+    const commaPos1 = line.indexOf(",");
+    if (commaPos1 > -1) {
+      name = line.substring(0, commaPos1).trim();
+      did = line.substring(commaPos1 + 1).trim();
+      const commaPos2 = line.indexOf(",", commaPos1 + 1);
+      if (commaPos2 > -1) {
+        did = line.substring(commaPos1 + 1, commaPos2).trim();
+        publicKeyInput = line.substring(commaPos2 + 1).trim();
+        const commaPos3 = line.indexOf(",", commaPos2 + 1);
+        if (commaPos3 > -1) {
+          publicKeyInput = line.substring(commaPos2 + 1, commaPos3).trim();
+          seesMe = line.substring(commaPos3 + 1).trim() == "true";
+          const commaPos4 = line.indexOf(",", commaPos3 + 1);
+          if (commaPos4 > -1) {
+            seesMe = line.substring(commaPos3 + 1, commaPos4).trim() == "true";
+            registered = line.substring(commaPos4 + 1).trim() == "true";
+          }
+        }
+      }
+    }
+    // help with potential mistakes while this sharing requires copy-and-paste
+    let publicKeyBase64 = publicKeyInput;
+    if (publicKeyBase64 && /^[0-9A-Fa-f]{66}$/i.test(publicKeyBase64)) {
+      // it must be all hex (compressed public key), so convert
+      publicKeyBase64 = Buffer.from(publicKeyBase64, "hex").toString("base64");
+    }
+    const newContact = {
+      did,
+      name,
+      publicKeyBase64,
+      seesMe,
+      registered,
+    };
    const platformService = PlatformServiceFactory.getInstance();
    const { sql, params } = databaseUtil.generateInsertStatement(
      newContact as unknown as Record<string, unknown>,
@@ -962,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
@@ -1122,7 +1160,7 @@ export default class ContactsView extends Vue {
              (regResult.error as string) ||
              "Something went wrong during registration.",
          },
-          -1,
+          5000,
        );
      }
    } catch (error) {
@@ -1156,7 +1194,7 @@ export default class ContactsView extends Vue {
          title: "Registration Error",
          text: userMessage,
        },
-        -1,
+        5000,
      );
    }
  }
@@ -1177,6 +1215,7 @@ export default class ContactsView extends Vue {
    );
    if (result.success) {
      //contact.seesMe = visibility; // why doesn't it affect the UI from here?
+      //console.log("Set result & seesMe", result, contact.seesMe, contact.did);
      if (showSuccessAlert) {
        this.$notify(
          {
@@ -1392,11 +1431,14 @@ export default class ContactsView extends Vue {
      }
      return contact;
    });
+    // console.log(
+    //   "Array of selected contacts:",
+    //   JSON.stringify(selectedContacts),
+    // );
    const contactsJwt = await createEndorserJwtForDid(this.activeDid, {
      contacts: selectedContacts,
    });
-    const contactsJwtUrl =
-      APP_SERVER + "/deep-link/contact-import/" + contactsJwt;
+    const contactsJwtUrl = APP_SERVER + "/contact-import/" + contactsJwt;
    useClipboard()
      .copy(contactsJwtUrl)
      .then(() => {
--- a/src/views/DeepLinkErrorView.vue
+++ b/src/views/DeepLinkErrorView.vue
@@ -66,14 +66,9 @@ const formattedPath = computed(() => {
  const path = originalPath.value.replace(/^\/+/, "");

  // Log for debugging
-  logger.log(
-    "[DeepLinkError] Original Path:",
-    originalPath.value,
-    "Route Params:",
-    route.params,
-    "Route Query:",
-    route.query,
-  );
+  logger.log("Original Path:", originalPath.value);
+  logger.log("Route Params:", route.params);
+  logger.log("Route Query:", route.query);

  return path;
 });
--- a/src/views/DeepLinkRedirectView.vue
+++ b/src/views/DeepLinkRedirectView.vue
@@ -1,227 +0,0 @@
-<template>
-  <!-- CONTENT -->
-  <section id="Content" class="relative w-[100vw] h-[100vh]">
-    <div
-      class="p-6 bg-white w-full max-w-[calc((100vh-env(safe-area-inset-top)-env(safe-area-inset-bottom))*0.4)] mx-auto"
-    >
-      <div class="mb-4">
-        <h1 class="text-xl text-center font-semibold relative mb-4">
-          Redirecting to Time Safari
-        </h1>
-
-        <div v-if="destinationUrl" class="space-y-4">
-          <!-- Platform-specific messaging -->
-          <div class="text-center text-gray-600 mb-4">
-            <p v-if="isMobile">
-              {{
-                isIOS
-                  ? "Opening Time Safari app on your iPhone..."
-                  : "Opening Time Safari app on your Android device..."
-              }}
-            </p>
-            <p v-else>Opening Time Safari app...</p>
-            <p class="text-sm mt-2">
-              <span v-if="isMobile"
-                >If the app doesn't open automatically, use one of these
-                options:</span
-              >
-              <span v-else>Choose how you'd like to open this link:</span>
-            </p>
-          </div>
-
-          <!-- Deep Link Button -->
-          <div class="text-center">
-            <a
-              :href="deepLinkUrl || '#'"
-              class="inline-block bg-blue-600 text-white px-6 py-3 rounded-lg font-medium hover:bg-blue-700 transition-colors"
-              @click="handleDeepLinkClick"
-            >
-              <span v-if="isMobile">Open in Time Safari App</span>
-              <span v-else>Try Opening in Time Safari App</span>
-            </a>
-          </div>
-
-          <!-- Web Fallback Link -->
-          <div class="text-center">
-            <a
-              :href="webUrl || '#'"
-              target="_blank"
-              class="inline-block bg-gray-600 text-white px-6 py-3 rounded-lg font-medium hover:bg-gray-700 transition-colors"
-              @click="handleWebFallbackClick"
-            >
-              <span v-if="isMobile">Open in Web Browser Instead</span>
-              <span v-else>Open in Web Browser</span>
-            </a>
-          </div>
-
-          <!-- Manual Instructions -->
-          <div class="text-center text-sm text-gray-500 mt-4">
-            <p v-if="isMobile">
-              Or manually open:
-              <code class="bg-gray-100 px-2 py-1 rounded">{{
-                deepLinkUrl
-              }}</code>
-            </p>
-            <p v-else>
-              If you have the Time Safari app installed, you can also copy this
-              link:
-              <code class="bg-gray-100 px-2 py-1 rounded">{{
-                deepLinkUrl
-              }}</code>
-            </p>
-          </div>
-
-          <!-- Platform info for debugging -->
-          <div
-            v-if="isDevelopment"
-            class="text-center text-xs text-gray-400 mt-4"
-          >
-            <p>
-              Platform: {{ isMobile ? (isIOS ? "iOS" : "Android") : "Desktop" }}
-            </p>
-            <p>User Agent: {{ userAgent.substring(0, 50) }}...</p>
-          </div>
-        </div>
-
-        <div v-else-if="pageError" class="text-center text-red-500 mb-4">
-          {{ pageError }}
-        </div>
-
-        <div v-else class="text-center text-gray-600">
-          <p>Processing redirect...</p>
-        </div>
-      </div>
-    </div>
-  </section>
-</template>
-
-<script lang="ts">
-import { Component, Vue } from "vue-facing-decorator";
-import { RouteLocationNormalizedLoaded, Router } from "vue-router";
-
-import { APP_SERVER } from "@/constants/app";
-import { logger } from "@/utils/logger";
-import { errorStringForLog } from "@/libs/endorserServer";
-import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
-
-@Component({})
-export default class DeepLinkRedirectView extends Vue {
-  $router!: Router;
-  $route!: RouteLocationNormalizedLoaded;
-  pageError: string | null = null;
-  destinationUrl: string | null = null; // full path after "/deep-link/"
-  deepLinkUrl: string | null = null; // mobile link starting "timesafari://"
-  webUrl: string | null = null; // web link, eg "https://timesafari.app/..."
-  isDevelopment: boolean = false;
-  userAgent: string = "";
-  private platformService = PlatformServiceFactory.getInstance();
-
-  mounted() {
-    // Get the path from the route parameter (catch-all parameter)
-    const pathParam = this.$route.params.path;
-
-    // If pathParam is an array (catch-all parameter), join it
-    const fullPath = Array.isArray(pathParam) ? pathParam.join("/") : pathParam;
-
-    // Get query parameters from the route
-    const queryParams = this.$route.query;
-
-    // Build query string if there are query parameters
-    let queryString = "";
-    if (Object.keys(queryParams).length > 0) {
-      const searchParams = new URLSearchParams();
-      Object.entries(queryParams).forEach(([key, value]) => {
-        if (value !== undefined && value !== null) {
-          const stringValue = Array.isArray(value) ? value[0] : value;
-          if (stringValue !== null && stringValue !== undefined) {
-            searchParams.append(key, stringValue);
-          }
-        }
-      });
-      queryString = "?" + searchParams.toString();
-    }
-
-    // Combine path with query parameters
-    const fullPathWithQuery = fullPath + queryString;
-
-    this.destinationUrl = fullPathWithQuery;
-    this.deepLinkUrl = `timesafari://${fullPathWithQuery}`;
-    this.webUrl = `${APP_SERVER}/${fullPathWithQuery}`;
-
-    this.isDevelopment = process.env.NODE_ENV !== "production";
-    this.userAgent = navigator.userAgent;
-
-    this.openDeepLink();
-  }
-
-  private openDeepLink() {
-    if (!this.deepLinkUrl || !this.webUrl) {
-      this.pageError =
-        "No deep link was provided. Check the URL and try again.";
-      return;
-    }
-
-    try {
-      // For mobile, try the deep link URL; for desktop, use the web URL
-      const redirectUrl = this.isMobile ? this.deepLinkUrl : this.webUrl;
-
-      // Method 1: Try window.location.href (works on most browsers)
-      window.location.href = redirectUrl;
-
-      // Method 2: Fallback - create and click a link element
-      setTimeout(() => {
-        try {
-          const link = document.createElement("a");
-          link.href = redirectUrl;
-          link.style.display = "none";
-          document.body.appendChild(link);
-          link.click();
-          document.body.removeChild(link);
-        } catch (error) {
-          logger.error(
-            "Fallback deep link failed: " + errorStringForLog(error),
-          );
-          this.pageError =
-            "Redirecting to the Time Safari app failed. Please use a manual option below.";
-        }
-      }, 100);
-    } catch (error) {
-      logger.error("Deep link redirect failed: " + errorStringForLog(error));
-      this.pageError =
-        "Unable to open the Time Safari app. Please use a manual option below.";
-    }
-  }
-
-  private handleDeepLinkClick(event: Event) {
-    if (!this.deepLinkUrl) return;
-
-    // Prevent default to handle the click manually
-    event.preventDefault();
-
-    this.openDeepLink();
-  }
-
-  private handleWebFallbackClick(event: Event) {
-    if (!this.webUrl) return;
-
-    // Get platform capabilities
-    const capabilities = this.platformService.getCapabilities();
-
-    // For mobile, try to open in a new tab/window
-    if (capabilities.isMobile) {
-      event.preventDefault();
-      window.open(this.webUrl, "_blank");
-    }
-    // For desktop, let the default behavior happen (opens in same tab)
-  }
-
-  // Computed properties for template
-  get isMobile(): boolean {
-    return this.platformService.getCapabilities().isMobile;
-  }
-
-  get isIOS(): boolean {
-    return this.platformService.getCapabilities().isIOS;
-  }
-}
-</script>
--- a/src/views/DiscoverView.vue
+++ b/src/views/DiscoverView.vue
@@ -523,7 +523,9 @@ export default class DiscoverView extends Vue {
      }
      // eslint-disable-next-line @typescript-eslint/no-explicit-any
    } catch (e: any) {
-      logger.error("Error with search all: " + errorStringForLog(e));
+      logger.error("Error with search all:", e);
+      // this sometimes gives different information
+      logger.error("Error with search all (error added): " + e);
      this.$notify(
        {
          group: "alert",
@@ -615,7 +617,7 @@ export default class DiscoverView extends Vue {
      }
      // eslint-disable-next-line @typescript-eslint/no-explicit-any
    } catch (e: any) {
-      logger.error("Error with search local: " + errorStringForLog(e));
+      logger.error("Error with search local:", e);
      this.$notify(
        {
          group: "alert",
@@ -786,7 +788,7 @@ export default class DiscoverView extends Vue {
    const route = {
      path: this.isProjectsActive
        ? "/project/" + encodeURIComponent(id)
-        : "/user-profile/" + encodeURIComponent(id),
+        : "/userProfile/" + encodeURIComponent(id),
    };
    this.$router.push(route);
  }
--- a/src/views/GiftedDetailsView.vue
+++ b/src/views/GiftedDetailsView.vue
@@ -826,7 +826,7 @@ export default class GiftedDetails extends Vue {
      }

      if (!result.success) {
-        const errorMessage = result.error;
+        const errorMessage = this.getGiveCreationErrorMessage(result);
        logger.error("Error with give creation result:", result);
        this.$notify(
          {
@@ -899,6 +899,19 @@ export default class GiftedDetails extends Vue {

  // Helper functions for readability

+  /**
+   * @param result direct response eg. ErrorResult or SuccessResult (potentially with embedded "data")
+   * @returns best guess at an error message
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  getGiveCreationErrorMessage(result: any) {
+    return (
+      result.error?.userMessage ||
+      result.error?.error ||
+      result.response?.data?.error?.message
+    );
+  }
+
  explainData() {
    this.$notify(
      {
--- a/src/views/HelpView.vue
+++ b/src/views/HelpView.vue
@@ -24,11 +24,11 @@
    <!-- eslint-disable prettier/prettier max-len -->
    <div>
      <p>
-        This app focuses on raw gratitude, using it to build cool things together with your network.
+        This app focuses on gifts & gratitude, using them to build cool things together with your network.
      </p>

      <p class="ml-4">
-        If you'd like to see the page-by-page help again,
+        If you'd like to see the page-by-page help,
        <span
          class="text-blue-500 cursor-pointer"
          @click="unsetFinishedOnboarding()"
@@ -37,16 +37,14 @@

      <h2 class="text-xl font-semibold">What is the idea here?</h2>
      <p>
-        We are building networks of people who want to grow good society from the ground up, using
-        modern technology that connects people peer-to-peer.
-        First of all, let's showcase gratitude: see what people have given, and recognize gifts
-        you've seen. This is done in a way that leaves a permanent record -- one that provably
-        came from you, and one that the recipient can prove they were mentioned.
-        This can be personally gratifying, but it extends to broader work: volunteers get
-        confirmation of activity, and they can selectively show off their contributions and
-        network.
-        This is a way to build trust and reputation. It's a way to build a network of people who
-        are willing to help each other.
+        We are building networks of people who want to grow good society from the ground up, using modern
+        technology that connects people peer-to-peer.
+        First of all, let's showcase gratitude: see what people have given, and recognize
+        gifts you've seen. This is done in a way that leaves a permanent record -- one that
+        came from you, and one that the recipient can prove it was for them. This can be
+        personally gratifying, but it extends to broader work: volunteers get
+        confirmation of activity, and they can selectively show off their contributions
+        and network.
      </p>
      <p class="mt-2">
        With this, you highlight giving and you also offer help --
@@ -557,6 +555,9 @@
        initiative.
      </p>

+      <h2 class="text-xl font-semibold">What app version is this?</h2>
+      <p>{{ package.version }} ({{ commitHash }})</p>
+
      <h2 class="text-xl font-semibold">
        I have other questions or feedback, like getting a new profile or removing my data or requesting an improvement.
      </h2>
@@ -566,28 +567,6 @@
          >info@TimeSafari.app</a
        >
      </p>
-
-      <h2 class="text-xl font-semibold">What app version is this?</h2>
-      <p>{{ package.version }} ({{ commitHash }})</p>
-
-      <div v-if="Capacitor.isNativePlatform()">
-        <h2 class="text-xl font-semibold">
-          Do I have the latest version?
-        </h2>
-        <p v-if="Capacitor.getPlatform() === 'ios'">
-          <a href="https://apps.apple.com/us/app/time-safari/id6742664907" target="_blank" class="text-blue-500">
-            Check the App Store.
-          </a>
-        </p>
-        <p v-else-if="Capacitor.getPlatform() === 'android'">
-          <a href="https://timesafari.app/app.apk" target="_blank" class="text-blue-500">
-            Download the latest APK to see.
-          </a>
-        </p>
-        <p v-else>
-          Sorry, your platform of '{{ Capacitor.getPlatform() }}' is not recognized.
-        </p>
-      </div>
    </div>
    <!-- eslint enable -->
  </section>
@@ -624,7 +603,6 @@ export default class HelpView extends Vue {
  showVerifiable = false;

  APP_SERVER = APP_SERVER;
-  Capacitor = Capacitor;

  // Ideally, we put no functionality in here, especially in the setup,
  // because we never want this page to have a chance of throwing an error.
@@ -644,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
@@ -519,6 +519,7 @@ export default class HomeView extends Vue {
      // Retrieve DIDs with better error handling
      try {
        this.allMyDids = await retrieveAccountDids();
+        logConsoleAndDb(`[HomeView] Retrieved ${this.allMyDids.length} DIDs`);
      } catch (error) {
        logConsoleAndDb(`[HomeView] Failed to retrieve DIDs: ${error}`, true);
        throw new Error(
@@ -551,6 +552,9 @@ export default class HomeView extends Vue {
        if (USE_DEXIE_DB) {
          settings = await retrieveSettingsForActiveAccount();
        }
+        logConsoleAndDb(
+          `[HomeView] Retrieved settings for ${settings.activeDid || "no active DID"}`,
+        );
      } catch (error) {
        logConsoleAndDb(
          `[HomeView] Failed to retrieve settings: ${error}`,
@@ -577,6 +581,9 @@ export default class HomeView extends Vue {
        if (USE_DEXIE_DB) {
          this.allContacts = await db.contacts.toArray();
        }
+        logConsoleAndDb(
+          `[HomeView] Retrieved ${this.allContacts.length} contacts`,
+        );
      } catch (error) {
        logConsoleAndDb(
          `[HomeView] Failed to retrieve contacts: ${error}`,
@@ -623,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()),
            });
@@ -634,6 +641,9 @@ export default class HomeView extends Vue {
              });
            }
            this.isRegistered = true;
+            logConsoleAndDb(
+              `[HomeView] User ${this.activeDid} is now registered`,
+            );
          }
        } catch (error) {
          logConsoleAndDb(
@@ -675,6 +685,11 @@ export default class HomeView extends Vue {
          this.newOffersToUserHitLimit = offersToUser.hitLimit;
          this.numNewOffersToUserProjects = offersToProjects.data.length;
          this.newOffersToUserProjectsHitLimit = offersToProjects.hitLimit;
+
+          logConsoleAndDb(
+            `[HomeView] Retrieved ${this.numNewOffersToUser} user offers and ` +
+              `${this.numNewOffersToUserProjects} project offers`,
+          );
        }
      } catch (error) {
        logConsoleAndDb(
@@ -770,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,
@@ -1828,7 +1843,7 @@ export default class HomeView extends Vue {
            this.axios,
          );

-          if (result.success) {
+          if (result.type === "success") {
            this.$notify(
              {
                group: "alert",
--- 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/InviteOneView.vue
+++ b/src/views/InviteOneView.vue
@@ -83,7 +83,7 @@
              <span
                v-else
                class="text-center text-slate-500 cursor-pointer"
-                :title="invite.inviteIdentifier"
+                :title="inviteLink(invite.jwt)"
                @click="
                  showInvite(
                    invite.inviteIdentifier,
@@ -241,7 +241,7 @@ export default class InviteOneView extends Vue {
  }

  inviteLink(jwt: string): string {
-    return APP_SERVER + "/deep-link/invite-one-accept/" + jwt;
+    return APP_SERVER + "/invite-one-accept/" + jwt;
  }

  copyInviteAndNotify(inviteId: string, jwt: string) {
@@ -324,7 +324,7 @@ export default class InviteOneView extends Vue {
          );
          await axios.post(
            this.apiServer + "/api/userUtil/invite",
-            { inviteJwt, notes, expiresAt },
+            { inviteIdentifier, inviteJwt, notes, expiresAt },
            { headers },
          );
          const newInvite = {
--- 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/OnboardMeetingSetupView.vue
+++ b/src/views/OnboardMeetingSetupView.vue
@@ -720,7 +720,7 @@ export default class OnboardMeetingView extends Vue {

  onboardMeetingMembersLink(): string {
    if (this.currentMeeting) {
-      return `${APP_SERVER}/deep-link/onboard-meeting-members/${this.currentMeeting?.groupId}?password=${encodeURIComponent(
+      return `${APP_SERVER}/onboard-meeting-members/${this.currentMeeting?.groupId}?password=${encodeURIComponent(
        this.currentMeeting?.password || "",
      )}`;
    }
--- a/src/views/ProjectViewView.vue
+++ b/src/views/ProjectViewView.vue
@@ -27,12 +27,6 @@
          >
            <font-awesome icon="pen" class="text-sm text-blue-500 ml-2 mb-1" />
          </button>
-          <button title="Copy Link to Project" @click="onCopyLinkClick()">
-            <font-awesome
-              icon="link"
-              class="text-sm text-slate-500 ml-2 mb-1"
-            />
-          </button>
        </h2>
      </div>
    </div>
@@ -58,28 +52,16 @@
                  icon="user"
                  class="fa-fw text-slate-400"
                ></font-awesome>
-                <span class="truncate inline-block max-w-[calc(100%-2rem)]">
-                  {{ issuerInfoObject?.displayName }}
-                </span>
-
-                <span
-                  v-if="!serverUtil.isHiddenDid(issuer)"
-                  class="inline-flex items-center"
-                >
-                  <router-link
-                    :to="{
-                      path: '/did/' + encodeURIComponent(issuer),
-                    }"
-                    class="text-blue-500 ml-1"
-                    title="See more about this person"
-                  >
+                {{ issuerInfoObject?.displayName }}
+                <span v-if="!serverUtil.isEmptyOrHiddenDid(issuer)">
+                  <a :href="`/did/${issuer}`" class="text-blue-500">
                    <font-awesome
                      icon="arrow-up-right-from-square"
                      class="fa-fw"
                    />
-                  </router-link>
+                  </a>
                </span>
-                <span v-if="serverUtil.isHiddenDid(issuer)" class="ml-1">
+                <span v-else-if="serverUtil.isHiddenDid(issuer)">
                  <font-awesome
                    icon="info-circle"
                    class="fa-fw text-blue-500 cursor-pointer"
@@ -123,7 +105,7 @@
                  class="fa-fw text-slate-400"
                ></font-awesome>
                <a
-                  :href="ensureScheme(url)"
+                  :href="addScheme(url)"
                  target="_blank"
                  class="underline text-blue-500"
                >
@@ -642,7 +624,7 @@ import TopMessage from "../components/TopMessage.vue";
 import QuickNav from "../components/QuickNav.vue";
 import EntityIcon from "../components/EntityIcon.vue";
 import ProjectIcon from "../components/ProjectIcon.vue";
-import { APP_SERVER, NotificationIface, USE_DEXIE_DB } from "../constants/app";
+import { NotificationIface, USE_DEXIE_DB } from "../constants/app";
 import * as databaseUtil from "../db/databaseUtil";
 import {
  db,
@@ -656,7 +638,6 @@ import { retrieveAccountDids } from "../libs/util";
 import HiddenDidDialog from "../components/HiddenDidDialog.vue";
 import { logger } from "../utils/logger";
 import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
-import { useClipboard } from "@vueuse/core";
 /**
 * Project View Component
 * @author Matthew Raymer
@@ -853,28 +834,6 @@ export default class ProjectViewView extends Vue {
    });
  }

-  onCopyLinkClick() {
-    const shortestProjectId = this.projectId.startsWith(
-      serverUtil.ENDORSER_CH_HANDLE_PREFIX,
-    )
-      ? this.projectId.substring(serverUtil.ENDORSER_CH_HANDLE_PREFIX.length)
-      : this.projectId;
-    const deepLink = `${APP_SERVER}/deep-link/project/${shortestProjectId}`;
-    useClipboard()
-      .copy(deepLink)
-      .then(() => {
-        this.$notify(
-          {
-            group: "alert",
-            type: "toast",
-            title: "Copied",
-            text: "A link to this project was copied to the clipboard.",
-          },
-          2000,
-        );
-      });
-  }
-
  // Isn't there a better way to make this available to the template?
  expandText() {
    this.expanded = true;
@@ -1337,7 +1296,7 @@ export default class ProjectViewView extends Vue {
  }

  // return an HTTPS URL if it's not a global URL
-  ensureScheme(url: string) {
+  addScheme(url: string) {
    if (!libsUtil.isGlobalUri(url)) {
      return "https://" + url;
    }
@@ -1466,7 +1425,7 @@ export default class ProjectViewView extends Vue {
      this.apiServer,
      this.axios,
    );
-    if (result.success) {
+    if (result.type === "success") {
      this.$notify(
        {
          group: "alert",
@@ -1498,13 +1457,7 @@ export default class ProjectViewView extends Vue {
  }

  openHiddenDidDialog() {
-    const shortestProjectId = this.projectId.startsWith(
-      serverUtil.ENDORSER_CH_HANDLE_PREFIX,
-    )
-      ? this.projectId.substring(serverUtil.ENDORSER_CH_HANDLE_PREFIX.length)
-      : this.projectId;
    (this.$refs.hiddenDidDialog as HiddenDidDialog).open(
-      "project/" + shortestProjectId,
      "creator",
      this.issuerVisibleToDids,
      this.allContacts,
--- a/src/views/QuickActionBvcEndView.vue
+++ b/src/views/QuickActionBvcEndView.vue
@@ -155,7 +155,7 @@ import { Contact } from "../db/tables/contacts";
 import {
  GenericCredWrapper,
  GenericVerifiableCredential,
-  CreateAndSubmitClaimResult,
+  ErrorResult,
 } from "../interfaces";
 import {
  BVC_MEETUPS_PROJECT_CLAIM_ID,
@@ -298,29 +298,28 @@ export default class QuickActionBvcBeginView extends Vue {
      }

      // in parallel, make a confirmation for each selected claim and send them all to the server
-      const confirmResults: PromiseSettledResult<CreateAndSubmitClaimResult>[] =
-        await Promise.allSettled(
-          this.claimsToConfirmSelected.map(async (jwtId) => {
-            const record = this.claimsToConfirm.find(
-              (claim) => claim.id === jwtId,
-            );
-            if (!record) {
-              return { success: false, error: "Record not found." };
-            }
-            return createAndSubmitConfirmation(
-              this.activeDid,
-              record.claim as GenericVerifiableCredential,
-              record.id,
-              record.handleId,
-              this.apiServer,
-              axios,
-            );
-          }),
-        );
+      const confirmResults = await Promise.allSettled(
+        this.claimsToConfirmSelected.map(async (jwtId) => {
+          const record = this.claimsToConfirm.find(
+            (claim) => claim.id === jwtId,
+          );
+          if (!record) {
+            return { type: "error", error: "Record not found." };
+          }
+          return createAndSubmitConfirmation(
+            this.activeDid,
+            record.claim as GenericVerifiableCredential,
+            record.id,
+            record.handleId,
+            this.apiServer,
+            axios,
+          );
+        }),
+      );
      // check for any rejected confirmations
      const confirmsSucceeded = confirmResults.filter(
-        // 'fulfilled' is the status in a successful PromiseFulfilledResult
-        (result) => result.status === "fulfilled" && result.value.success,
+        (result) =>
+          result.status === "fulfilled" && result.value.type === "success",
      );
      if (confirmsSucceeded.length < this.claimsToConfirmSelected.length) {
        logger.error("Error sending confirmations:", confirmResults);
@@ -354,7 +353,7 @@ export default class QuickActionBvcBeginView extends Vue {
          undefined,
          BVC_MEETUPS_PROJECT_CLAIM_ID,
        );
-        giveSucceeded = giveResult.success;
+        giveSucceeded = giveResult.type === "success";
        if (!giveSucceeded) {
          logger.error("Error sending give:", giveResult);
          this.$notify(
@@ -363,7 +362,7 @@ export default class QuickActionBvcBeginView extends Vue {
              type: "danger",
              title: "Error",
              text:
-                (giveResult as CreateAndSubmitClaimResult)?.error ||
+                (giveResult as ErrorResult)?.error?.userMessage ||
                "There was an error sending that give.",
            },
            5000,
--- 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,
        });
      }
--- a/src/views/ShareMyContactInfoView.vue
+++ b/src/views/ShareMyContactInfoView.vue
@@ -105,7 +105,7 @@ export default class ShareMyContactInfoView extends Vue {
              group: "alert",
              type: "info",
              title: "Copied",
-              text: "Your contact info was copied to the clipboard. Have them click on it, or paste it in the box on their 'Contacts' screen.",
+              text: "Your contact info was copied to the clipboard. Have them paste it in the box on their 'Contacts' screen.",
            },
            5000,
          );
--- a/src/views/UserProfileView.vue
+++ b/src/views/UserProfileView.vue
@@ -16,7 +16,6 @@
        </button>
        Individual Profile
      </h1>
-      <div class="text-sm text-center text-slate-500"></div>
    </div>

    <!-- Loading Animation -->
@@ -33,12 +32,6 @@
        <div class="text-sm">
          <font-awesome icon="user" class="fa-fw text-slate-400"></font-awesome>
          {{ didInfo(profile.issuerDid, activeDid, allMyDids, allContacts) }}
-          <button title="Copy Link to Profile" @click="onCopyLinkClick()">
-            <font-awesome
-              icon="link"
-              class="text-sm text-slate-500 ml-2 mb-1"
-            />
-          </button>
        </div>
        <p v-if="profile.description" class="mt-4 text-slate-600">
          {{ profile.description }}
@@ -107,7 +100,6 @@ import { Router, RouteLocationNormalizedLoaded } from "vue-router";
 import QuickNav from "../components/QuickNav.vue";
 import TopMessage from "../components/TopMessage.vue";
 import {
-  APP_SERVER,
  DEFAULT_PARTNER_API_SERVER,
  NotificationIface,
  USE_DEXIE_DB,
@@ -121,7 +113,6 @@ import { retrieveAccountDids } from "../libs/util";
 import { logger } from "../utils/logger";
 import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
 import { Settings } from "@/db/tables/settings";
-import { useClipboard } from "@vueuse/core";
@Component({
  components: {
    LMap,
@@ -195,10 +186,6 @@ export default class UserProfileView extends Vue {
      if (response.status === 200) {
        const result = await response.json();
        this.profile = result.data;
-        if (this.profile && this.profile.rowId !== profileId) {
-          // currently the server returns "rowid" with lowercase "i"; remove when that's fixed
-          this.profile.rowId = profileId;
-        }
      } else {
        throw new Error("Failed to load profile");
      }
@@ -217,22 +204,5 @@ export default class UserProfileView extends Vue {
      this.isLoading = false;
    }
  }
-
-  onCopyLinkClick() {
-    const deepLink = `${APP_SERVER}/deep-link/user-profile/${this.profile?.rowId}`;
-    useClipboard()
-      .copy(deepLink)
-      .then(() => {
-        this.$notify(
-          {
-            group: "alert",
-            type: "toast",
-            title: "Copied",
-            text: "A link to this profile was copied to the clipboard.",
-          },
-          2000,
-        );
-      });
-  }
 }
 </script>