From e371566762ea4c165c47bcf9f447fe88a90d092c Mon Sep 17 00:00:00 2001
From: Matthew Raymer <mraymer@osinetwork.net>
Date: Tue, 4 Feb 2025 03:50:31 +0000
Subject: [PATCH] Merge branch 'master' into split_build_process

fix: update import paths from alias to relative

- Replace @ alias imports with relative paths in HiddenDidDialog and UserProfileView
- Maintain consistent import style across components
- Improve build compatibility across different environments

This change helps ensure consistent module resolution across different
build targets including Capacitor and Electron builds.
---
 src/components/HiddenDidDialog.vue |  6 +++---
 src/views/UserProfileView.vue      | 19 +++++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/components/HiddenDidDialog.vue b/src/components/HiddenDidDialog.vue
index fc9f884..8ce558b 100644
--- a/src/components/HiddenDidDialog.vue
+++ b/src/components/HiddenDidDialog.vue
@@ -100,9 +100,9 @@
 import { Component, Vue } from "vue-facing-decorator";
 import * as R from "ramda";
 import { useClipboard } from "@vueuse/core";
-import { Contact } from "@/db/tables/contacts";
-import * as serverUtil from "@/libs/endorserServer";
-import { NotificationIface } from "@/constants/app";
+import { Contact } from "../db/tables/contacts";
+import * as serverUtil from "../libs/endorserServer";
+import { NotificationIface } from "../constants/app";
 
 @Component
 export default class HiddenDidDialog extends Vue {
diff --git a/src/views/UserProfileView.vue b/src/views/UserProfileView.vue
index 0e7bfaf..2588c41 100644
--- a/src/views/UserProfileView.vue
+++ b/src/views/UserProfileView.vue
@@ -97,14 +97,17 @@ import { Component, Vue } from "vue-facing-decorator";
 import { LMap, LTileLayer, LMarker, LPopup } from "@vue-leaflet/vue-leaflet";
 import { Router, RouteLocationNormalizedLoaded } from "vue-router";
 
-import QuickNav from "@/components/QuickNav.vue";
-import TopMessage from "@/components/TopMessage.vue";
-import { DEFAULT_PARTNER_API_SERVER, NotificationIface } from "@/constants/app";
-import { db } from "@/db/index";
-import { Contact } from "@/db/tables/contacts";
-import { didInfo, getHeaders } from "@/libs/endorserServer";
-import { UserProfile } from "@/libs/partnerServer";
-import { retrieveAccountDids } from "@/libs/util";
+import QuickNav from "../components/QuickNav.vue";
+import TopMessage from "../components/TopMessage.vue";
+import {
+  DEFAULT_PARTNER_API_SERVER,
+  NotificationIface,
+} from "../constants/app";
+import { db } from "../db/index";
+import { Contact } from "../db/tables/contacts";
+import { didInfo, getHeaders } from "../libs/endorserServer";
+import { UserProfile } from "../libs/partnerServer";
+import { retrieveAccountDids } from "../libs/util";
 
 @Component({
   components: {