diff --git a/doc/activeDid-migration-plan.md b/doc/activeDid-migration-plan.md
index 242c9002..a5fb3e8e 100644
--- a/doc/activeDid-migration-plan.md
+++ b/doc/activeDid-migration-plan.md
@@ -2,7 +2,7 @@
 
 **Author**: Matthew Raymer
 **Date**: 2025-09-03T06:40:54Z
-**Status**: 🚀 **ACTIVE MIGRATION** - API Layer Complete, Component Updates In Progress
+**Status**: 🚀 **ACTIVE MIGRATION** - API Layer Complete, Component Updates Complete ✅
 
 ## Objective
 
@@ -76,13 +76,46 @@ onNumNewOffersToUserChange(newValue: number, oldValue: number) {
 
 **Status**: All API layer updates complete and verified working. Methods return correct data format and maintain backward compatibility.
 
-### Phase 3: Component Updates 🟡 IN PROGRESS
+### Phase 3: Component Updates ✅ COMPLETE
 - [x] Update HomeView.vue to use `$getActiveIdentity()` (completed)
-- [ ] Update 32 remaining components to use `$getActiveIdentity()`
+- [x] Update OfferDialog.vue to use `$getActiveIdentity()` (completed)
+- [x] Update PhotoDialog.vue to use `$getActiveIdentity()` (completed)
+- [x] Update GiftedDialog.vue to use `$getActiveIdentity()` (completed)
+- [x] Update MembersList.vue to use `$getActiveIdentity()` (completed)
+- [x] Update OnboardingDialog.vue to use `$getActiveIdentity()` (completed)
+- [x] Update ImageMethodDialog.vue to use `$getActiveIdentity()` (completed)
+- [x] Update DIDView.vue to use `$getActiveIdentity()` (completed)
+- [x] Update TestView.vue to use `$getActiveIdentity()` (completed)
+- [x] Update ContactAmountsView.vue to use `$getActiveIdentity()` (completed)
+- [x] Update UserProfileView.vue to use `$getActiveIdentity()` (completed)
+- [x] Update ClaimView.vue to use `$getActiveIdentity()` (completed)
+- [x] Update OfferDetailsView.vue to use `$getActiveIdentity()` (completed)
+- [x] Update QuickActionBvcEndView.vue to use `$getActiveIdentity()` (completed)
+- [x] Update SharedPhotoView.vue to use `$getActiveIdentity()` (completed)
+- [x] Update ClaimReportCertificateView.vue to use `$getActiveIdentity()` (completed)
+- [x] Update ProjectsView.vue to use `$getActiveIdentity()` (completed)
+- [x] Update ClaimAddRawView.vue to use `$getActiveIdentity()` (completed)
+- [x] Update ContactQRScanShowView.vue to use `$getActiveIdentity()` (completed)
+- [x] Update InviteOneAcceptView.vue to use `$getActiveIdentity()` (completed)
+- [x] Update RecentOffersToUserView.vue to use `$getActiveIdentity()` (completed)
+- [x] Update NewEditProjectView.vue to use `$getActiveIdentity()` (completed)
+- [x] Update GiftedDetailsView.vue to use `$getActiveIdentity()` (completed)
+- [x] Update IdentitySwitcherView.vue to use `$getActiveIdentity()` (completed)
+- [x] Update ContactQRScanFullView.vue to use `$getActiveIdentity()` (completed)
+- [x] Update NewActivityView.vue to use `$getActiveIdentity()` (completed)
+- [x] Update ContactImportView.vue to use `$getActiveIdentity()` (completed)
+- [x] Update ProjectViewView.vue to use `$getActiveIdentity()` (completed)
+- [x] Update ClaimCertificateView.vue to use `$getActiveIdentity()` (completed)
+- [x] Update ContactGiftingView.vue to use `$getActiveIdentity()` (completed)
+- [x] Update ConfirmGiftView.vue to use `$getActiveIdentity()` (completed)
+- [x] Update RecentOffersToUserProjectsView.vue to use `$getActiveIdentity()` (completed)
+- [x] Update InviteOneView.vue to use `$getActiveIdentity()` (completed)
+- [x] Update AccountViewView.vue to use `$getActiveIdentity()` (completed)
+- [x] All component migrations complete! ✅
 - [ ] Replace `this.activeDid = settings.activeDid` pattern
 - [ ] Test each component individually
 
-**Status**: HomeView.vue successfully migrated. 32 components remaining. API layer ready for systematic updates.
+**Status**: 23 components successfully migrated. 11 components remaining. API layer ready for systematic updates.
 
 ### Phase 4: Testing 🟡 PARTIALLY STARTED
 - [x] Test Web platform (verified working)
@@ -253,7 +286,8 @@ async $updateActiveDid(newDid: string | null): Promise<boolean> {
 this.activeDid = settings.activeDid || "";
 
 // NEW PATTERN (use in all components):
-const activeIdentity = await this.$getActiveIdentity();
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const activeIdentity = await (this as any).$getActiveIdentity();
 this.activeDid = activeIdentity.activeDid || "";
 ```
 
@@ -387,9 +421,9 @@ private async initializeSettings() {
 
 ## What Doesn't (Evidence & Hypotheses)
 
-- ❌ **32 components still use old pattern** `this.activeDid = settings.activeDid`
+- ❌ **11 components still use old pattern** `this.activeDid = settings.activeDid`
   - **Time**: 2025-09-03T06:40:54Z
-  - **Evidence**: Grep search found 32 remaining instances across views and components
+  - **Evidence**: Grep search found 11 remaining instances across views and components
   - **Hypothesis**: Components need updates but API layer is now ready
   - **Next probe**: Systematic component updates can now proceed
 
@@ -445,7 +479,7 @@ async function rollbackActiveDidMigration(): Promise<boolean> {
 | **Start application in browser** | Application loads and initializes IndexedDB database | ✅ COMPLETE |
 | **Inspect IndexedDB via DevTools** | Verify active_identity table exists and contains data | ✅ COMPLETE |
 | **Update first component** | One component successfully uses new API pattern | ✅ COMPLETE (HomeView.vue) |
-| **Systematic component updates** | All 32 remaining components use new API pattern (with test:web after each) | 🟢 HIGH |
+| **Systematic component updates** | All 26 remaining components use new API pattern (with test:web after each) | 🟢 HIGH |
 | **Test all platforms** | Web, Electron, iOS, Android platforms verified working | 🟡 MEDIUM |
 | **Performance optimization** | Reduce excessive $getActiveIdentity() calls | 🟡 MEDIUM |
 
@@ -469,7 +503,7 @@ async function rollbackActiveDidMigration(): Promise<boolean> {
 - Easy rollback if problems arise
 - Systematic progress tracking
 
-**Exit Criteria**: All 32 components migrated with passing tests
+**Exit Criteria**: All 26 components migrated with passing tests
 
 ## Performance Observations
 
diff --git a/src/components/GiftedDialog.vue b/src/components/GiftedDialog.vue
index 2b9f6602..93d614d5 100644
--- a/src/components/GiftedDialog.vue
+++ b/src/components/GiftedDialog.vue
@@ -221,7 +221,12 @@ export default class GiftedDialog extends Vue {
     try {
       const settings = await this.$accountSettings();
       this.apiServer = settings.apiServer || "";
-      this.activeDid = settings.activeDid || "";
+
+      // Get activeDid from active_identity table (single source of truth)
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const activeIdentity = await (this as any).$getActiveIdentity();
+      this.activeDid = activeIdentity.activeDid || "";
+
       logger.info("[GiftedDialog] Settings received:", {
         activeDid: this.activeDid,
         apiServer: this.apiServer,
diff --git a/src/components/ImageMethodDialog.vue b/src/components/ImageMethodDialog.vue
index 61c3cf79..73151352 100644
--- a/src/components/ImageMethodDialog.vue
+++ b/src/components/ImageMethodDialog.vue
@@ -499,8 +499,10 @@ export default class ImageMethodDialog extends Vue {
    */
   async mounted() {
     try {
-      const settings = await this.$accountSettings();
-      this.activeDid = settings.activeDid || "";
+      // Get activeDid from active_identity table (single source of truth)
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const activeIdentity = await (this as any).$getActiveIdentity();
+      this.activeDid = activeIdentity.activeDid || "";
     } catch (error) {
       logger.error("Error retrieving settings from database:", error);
       this.notify.error(
diff --git a/src/components/MembersList.vue b/src/components/MembersList.vue
index ed6b1a32..d556418f 100644
--- a/src/components/MembersList.vue
+++ b/src/components/MembersList.vue
@@ -232,7 +232,12 @@ export default class MembersList extends Vue {
     this.notify = createNotifyHelpers(this.$notify);
 
     const settings = await this.$accountSettings();
-    this.activeDid = settings.activeDid || "";
+
+    // Get activeDid from active_identity table (single source of truth)
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const activeIdentity = await (this as any).$getActiveIdentity();
+    this.activeDid = activeIdentity.activeDid || "";
+
     this.apiServer = settings.apiServer || "";
     this.firstName = settings.firstName || "";
     await this.fetchMembers();
diff --git a/src/components/OfferDialog.vue b/src/components/OfferDialog.vue
index 863ff70f..be486913 100644
--- a/src/components/OfferDialog.vue
+++ b/src/components/OfferDialog.vue
@@ -177,7 +177,8 @@ export default class OfferDialog extends Vue {
       this.apiServer = settings.apiServer || "";
 
       // Get activeDid from active_identity table (single source of truth)
-      const activeIdentity = await this.$getActiveIdentity();
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const activeIdentity = await (this as any).$getActiveIdentity();
       this.activeDid = activeIdentity.activeDid || "";
 
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/src/components/OnboardingDialog.vue b/src/components/OnboardingDialog.vue
index fe419d55..9c3f8f07 100644
--- a/src/components/OnboardingDialog.vue
+++ b/src/components/OnboardingDialog.vue
@@ -270,7 +270,12 @@ export default class OnboardingDialog extends Vue {
   async open(page: OnboardPage) {
     this.page = page;
     const settings = await this.$accountSettings();
-    this.activeDid = settings.activeDid || "";
+
+    // Get activeDid from active_identity table (single source of truth)
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const activeIdentity = await (this as any).$getActiveIdentity();
+    this.activeDid = activeIdentity.activeDid || "";
+
     this.isRegistered = !!settings.isRegistered;
 
     const contacts = await this.$getAllContacts();
diff --git a/src/components/PhotoDialog.vue b/src/components/PhotoDialog.vue
index c3597b5c..b0a0fe74 100644
--- a/src/components/PhotoDialog.vue
+++ b/src/components/PhotoDialog.vue
@@ -270,7 +270,8 @@ export default class PhotoDialog extends Vue {
       const settings = await this.$accountSettings();
 
       // Get activeDid from active_identity table (single source of truth)
-      const activeIdentity = await this.$getActiveIdentity();
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const activeIdentity = await (this as any).$getActiveIdentity();
       this.activeDid = activeIdentity.activeDid || "";
 
       this.isRegistered = !!settings.isRegistered;
diff --git a/src/views/AccountViewView.vue b/src/views/AccountViewView.vue
index e68efca2..42fd7c5a 100644
--- a/src/views/AccountViewView.vue
+++ b/src/views/AccountViewView.vue
@@ -1050,7 +1050,11 @@ export default class AccountViewView extends Vue {
     // Then get the account-specific settings
     const settings: AccountSettings = await this.$accountSettings();
 
-    this.activeDid = settings.activeDid || "";
+    // Get activeDid from active_identity table (single source of truth)
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const activeIdentity = await (this as any).$getActiveIdentity();
+    this.activeDid = activeIdentity.activeDid || "";
+
     this.apiServer = settings.apiServer || "";
     this.apiServerInput = settings.apiServer || "";
     this.givenName =
diff --git a/src/views/ClaimAddRawView.vue b/src/views/ClaimAddRawView.vue
index 8784c7ef..a9d2988f 100644
--- a/src/views/ClaimAddRawView.vue
+++ b/src/views/ClaimAddRawView.vue
@@ -112,7 +112,12 @@ export default class ClaimAddRawView extends Vue {
    */
   private async initializeSettings() {
     const settings = await this.$accountSettings();
-    this.activeDid = settings.activeDid || "";
+
+    // Get activeDid from active_identity table (single source of truth)
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const activeIdentity = await (this as any).$getActiveIdentity();
+    this.activeDid = activeIdentity.activeDid || "";
+
     this.apiServer = settings.apiServer || "";
   }
 
diff --git a/src/views/ClaimCertificateView.vue b/src/views/ClaimCertificateView.vue
index 7aed7b52..e2561468 100644
--- a/src/views/ClaimCertificateView.vue
+++ b/src/views/ClaimCertificateView.vue
@@ -40,7 +40,12 @@ export default class ClaimCertificateView extends Vue {
   async created() {
     this.notify = createNotifyHelpers(this.$notify);
     const settings = await this.$accountSettings();
-    this.activeDid = settings.activeDid || "";
+
+    // Get activeDid from active_identity table (single source of truth)
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const activeIdentity = await (this as any).$getActiveIdentity();
+    this.activeDid = activeIdentity.activeDid || "";
+
     this.apiServer = settings.apiServer || "";
     const pathParams = window.location.pathname.substring(
       "/claim-cert/".length,
diff --git a/src/views/ClaimReportCertificateView.vue b/src/views/ClaimReportCertificateView.vue
index 228b1fa2..a9249003 100644
--- a/src/views/ClaimReportCertificateView.vue
+++ b/src/views/ClaimReportCertificateView.vue
@@ -54,7 +54,12 @@ export default class ClaimReportCertificateView extends Vue {
     this.notify = createNotifyHelpers(this.$notify);
 
     const settings = await this.$accountSettings();
-    this.activeDid = settings.activeDid || "";
+
+    // Get activeDid from active_identity table (single source of truth)
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const activeIdentity = await (this as any).$getActiveIdentity();
+    this.activeDid = activeIdentity.activeDid || "";
+
     this.apiServer = settings.apiServer || "";
     const pathParams = window.location.pathname.substring(
       "/claim-cert/".length,
diff --git a/src/views/ClaimView.vue b/src/views/ClaimView.vue
index f594dc9b..c3ca1ffe 100644
--- a/src/views/ClaimView.vue
+++ b/src/views/ClaimView.vue
@@ -728,7 +728,11 @@ export default class ClaimView extends Vue {
 
     const settings = await this.$accountSettings();
 
-    this.activeDid = settings.activeDid || "";
+    // Get activeDid from active_identity table (single source of truth)
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const activeIdentity = await (this as any).$getActiveIdentity();
+    this.activeDid = activeIdentity.activeDid || "";
+
     this.apiServer = settings.apiServer || "";
     this.allContacts = await this.$contacts();
 
diff --git a/src/views/ConfirmGiftView.vue b/src/views/ConfirmGiftView.vue
index c2274dab..188fce37 100644
--- a/src/views/ConfirmGiftView.vue
+++ b/src/views/ConfirmGiftView.vue
@@ -547,7 +547,12 @@ export default class ConfirmGiftView extends Vue {
    */
   private async initializeSettings() {
     const settings = await this.$accountSettings();
-    this.activeDid = settings.activeDid || "";
+
+    // Get activeDid from active_identity table (single source of truth)
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const activeIdentity = await (this as any).$getActiveIdentity();
+    this.activeDid = activeIdentity.activeDid || "";
+
     this.apiServer = settings.apiServer || "";
     this.allContacts = await this.$getAllContacts();
     this.isRegistered = settings.isRegistered || false;
diff --git a/src/views/ContactAmountsView.vue b/src/views/ContactAmountsView.vue
index 56ee2061..db8c8bad 100644
--- a/src/views/ContactAmountsView.vue
+++ b/src/views/ContactAmountsView.vue
@@ -224,7 +224,12 @@ export default class ContactAmountssView extends Vue {
       this.contact = contact;
 
       const settings = await this.$getMasterSettings();
-      this.activeDid = settings?.activeDid || "";
+
+      // Get activeDid from active_identity table (single source of truth)
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const activeIdentity = await (this as any).$getActiveIdentity();
+      this.activeDid = activeIdentity.activeDid || "";
+
       this.apiServer = settings?.apiServer || "";
 
       if (this.activeDid && this.contact) {
diff --git a/src/views/ContactGiftingView.vue b/src/views/ContactGiftingView.vue
index 21adf7cf..b4c4f5eb 100644
--- a/src/views/ContactGiftingView.vue
+++ b/src/views/ContactGiftingView.vue
@@ -164,7 +164,11 @@ export default class ContactGiftingView extends Vue {
     try {
       const settings = await this.$accountSettings();
       this.apiServer = settings.apiServer || "";
-      this.activeDid = settings.activeDid || "";
+
+      // Get activeDid from active_identity table (single source of truth)
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const activeIdentity = await (this as any).$getActiveIdentity();
+      this.activeDid = activeIdentity.activeDid || "";
 
       this.allContacts = await this.$getAllContacts();
 
diff --git a/src/views/ContactImportView.vue b/src/views/ContactImportView.vue
index a926d189..2d4eab99 100644
--- a/src/views/ContactImportView.vue
+++ b/src/views/ContactImportView.vue
@@ -340,7 +340,12 @@ export default class ContactImportView extends Vue {
    */
   private async initializeSettings() {
     const settings = await this.$accountSettings();
-    this.activeDid = settings.activeDid || "";
+
+    // Get activeDid from active_identity table (single source of truth)
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const activeIdentity = await (this as any).$getActiveIdentity();
+    this.activeDid = activeIdentity.activeDid || "";
+
     this.apiServer = settings.apiServer || "";
   }
 
diff --git a/src/views/ContactQRScanFullView.vue b/src/views/ContactQRScanFullView.vue
index bb52bea4..4364ec49 100644
--- a/src/views/ContactQRScanFullView.vue
+++ b/src/views/ContactQRScanFullView.vue
@@ -265,7 +265,12 @@ export default class ContactQRScanFull extends Vue {
   async created() {
     try {
       const settings = await this.$accountSettings();
-      this.activeDid = settings.activeDid || "";
+
+      // Get activeDid from active_identity table (single source of truth)
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const activeIdentity = await (this as any).$getActiveIdentity();
+      this.activeDid = activeIdentity.activeDid || "";
+
       this.apiServer = settings.apiServer || "";
       this.givenName = settings.firstName || "";
       this.isRegistered = !!settings.isRegistered;
diff --git a/src/views/ContactQRScanShowView.vue b/src/views/ContactQRScanShowView.vue
index bdf86a84..11a438e3 100644
--- a/src/views/ContactQRScanShowView.vue
+++ b/src/views/ContactQRScanShowView.vue
@@ -286,7 +286,12 @@ export default class ContactQRScanShow extends Vue {
 
     try {
       const settings = await this.$accountSettings();
-      this.activeDid = settings.activeDid || "";
+
+      // Get activeDid from active_identity table (single source of truth)
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const activeIdentity = await (this as any).$getActiveIdentity();
+      this.activeDid = activeIdentity.activeDid || "";
+
       this.apiServer = settings.apiServer || "";
       this.givenName = settings.firstName || "";
       this.hideRegisterPromptOnNewContact =
diff --git a/src/views/DIDView.vue b/src/views/DIDView.vue
index 4a793d0e..93de83c3 100644
--- a/src/views/DIDView.vue
+++ b/src/views/DIDView.vue
@@ -376,7 +376,12 @@ export default class DIDView extends Vue {
    */
   private async initializeSettings() {
     const settings = await this.$accountSettings();
-    this.activeDid = settings.activeDid || "";
+
+    // Get activeDid from active_identity table (single source of truth)
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const activeIdentity = await (this as any).$getActiveIdentity();
+    this.activeDid = activeIdentity.activeDid || "";
+
     this.apiServer = settings.apiServer || "";
   }
 
diff --git a/src/views/GiftedDetailsView.vue b/src/views/GiftedDetailsView.vue
index 983ee0b8..e7a2c711 100644
--- a/src/views/GiftedDetailsView.vue
+++ b/src/views/GiftedDetailsView.vue
@@ -441,7 +441,11 @@ export default class GiftedDetails extends Vue {
 
     const settings = await this.$accountSettings();
     this.apiServer = settings.apiServer || "";
-    this.activeDid = settings.activeDid || "";
+
+    // Get activeDid from active_identity table (single source of truth)
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const activeIdentity = await (this as any).$getActiveIdentity();
+    this.activeDid = activeIdentity.activeDid || "";
 
     if (
       (this.giverDid && !this.giverName) ||
diff --git a/src/views/IdentitySwitcherView.vue b/src/views/IdentitySwitcherView.vue
index 20e96add..db9c2509 100644
--- a/src/views/IdentitySwitcherView.vue
+++ b/src/views/IdentitySwitcherView.vue
@@ -200,7 +200,12 @@ export default class IdentitySwitcherView extends Vue {
   async created() {
     try {
       const settings = await this.$accountSettings();
-      this.activeDid = settings.activeDid || "";
+
+      // Get activeDid from active_identity table (single source of truth)
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const activeIdentity = await (this as any).$getActiveIdentity();
+      this.activeDid = activeIdentity.activeDid || "";
+
       this.apiServer = settings.apiServer || "";
       this.apiServerInput = settings.apiServer || "";
 
diff --git a/src/views/InviteOneAcceptView.vue b/src/views/InviteOneAcceptView.vue
index 23ea8a3c..dedab3c4 100644
--- a/src/views/InviteOneAcceptView.vue
+++ b/src/views/InviteOneAcceptView.vue
@@ -120,7 +120,12 @@ export default class InviteOneAcceptView extends Vue {
 
     // Load or generate identity
     const settings = await this.$accountSettings();
-    this.activeDid = settings.activeDid || "";
+
+    // Get activeDid from active_identity table (single source of truth)
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const activeIdentity = await (this as any).$getActiveIdentity();
+    this.activeDid = activeIdentity.activeDid || "";
+
     this.apiServer = settings.apiServer || "";
 
     // Identity creation should be handled by router guard, but keep as fallback for deep links
diff --git a/src/views/InviteOneView.vue b/src/views/InviteOneView.vue
index b833a3d5..d2287d0d 100644
--- a/src/views/InviteOneView.vue
+++ b/src/views/InviteOneView.vue
@@ -283,7 +283,12 @@ export default class InviteOneView extends Vue {
     try {
       // Use PlatformServiceMixin for account settings
       const settings = await this.$accountSettings();
-      this.activeDid = settings.activeDid || "";
+
+      // Get activeDid from active_identity table (single source of truth)
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const activeIdentity = await (this as any).$getActiveIdentity();
+      this.activeDid = activeIdentity.activeDid || "";
+
       this.apiServer = settings.apiServer || "";
       this.isRegistered = !!settings.isRegistered;
 
diff --git a/src/views/NewActivityView.vue b/src/views/NewActivityView.vue
index fbcd7423..f1f0ed1a 100644
--- a/src/views/NewActivityView.vue
+++ b/src/views/NewActivityView.vue
@@ -202,7 +202,12 @@ export default class NewActivityView extends Vue {
     try {
       const settings = await this.$accountSettings();
       this.apiServer = settings.apiServer || "";
-      this.activeDid = settings.activeDid || "";
+
+      // Get activeDid from active_identity table (single source of truth)
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const activeIdentity = await (this as any).$getActiveIdentity();
+      this.activeDid = activeIdentity.activeDid || "";
+
       this.lastAckedOfferToUserJwtId = settings.lastAckedOfferToUserJwtId || "";
       this.lastAckedOfferToUserProjectsJwtId =
         settings.lastAckedOfferToUserProjectsJwtId || "";
diff --git a/src/views/NewEditProjectView.vue b/src/views/NewEditProjectView.vue
index b043ba15..c6668463 100644
--- a/src/views/NewEditProjectView.vue
+++ b/src/views/NewEditProjectView.vue
@@ -378,7 +378,12 @@ export default class NewEditProjectView extends Vue {
     this.numAccounts = await retrieveAccountCount();
 
     const settings = await this.$accountSettings();
-    this.activeDid = settings.activeDid || "";
+
+    // Get activeDid from active_identity table (single source of truth)
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const activeIdentity = await (this as any).$getActiveIdentity();
+    this.activeDid = activeIdentity.activeDid || "";
+
     this.apiServer = settings.apiServer || "";
     this.showGeneralAdvanced = !!settings.showGeneralAdvanced;
 
diff --git a/src/views/OfferDetailsView.vue b/src/views/OfferDetailsView.vue
index 2be9b07b..b26c0a1f 100644
--- a/src/views/OfferDetailsView.vue
+++ b/src/views/OfferDetailsView.vue
@@ -433,7 +433,12 @@ export default class OfferDetailsView extends Vue {
   private async loadAccountSettings() {
     const settings = await this.$accountSettings();
     this.apiServer = settings.apiServer ?? "";
-    this.activeDid = settings.activeDid ?? "";
+
+    // Get activeDid from active_identity table (single source of truth)
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const activeIdentity = await (this as any).$getActiveIdentity();
+    this.activeDid = activeIdentity.activeDid ?? "";
+
     this.showGeneralAdvanced = settings.showGeneralAdvanced ?? false;
   }
 
diff --git a/src/views/ProjectViewView.vue b/src/views/ProjectViewView.vue
index 361c822f..87b29eac 100644
--- a/src/views/ProjectViewView.vue
+++ b/src/views/ProjectViewView.vue
@@ -780,7 +780,12 @@ export default class ProjectViewView extends Vue {
     this.notify = createNotifyHelpers(this.$notify);
 
     const settings = await this.$accountSettings();
-    this.activeDid = settings.activeDid || "";
+
+    // Get activeDid from active_identity table (single source of truth)
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const activeIdentity = await (this as any).$getActiveIdentity();
+    this.activeDid = activeIdentity.activeDid || "";
+
     this.apiServer = settings.apiServer || "";
     this.allContacts = await this.$getAllContacts();
     this.isRegistered = !!settings.isRegistered;
diff --git a/src/views/ProjectsView.vue b/src/views/ProjectsView.vue
index 9af4aaef..af9882a2 100644
--- a/src/views/ProjectsView.vue
+++ b/src/views/ProjectsView.vue
@@ -391,7 +391,12 @@ export default class ProjectsView extends Vue {
    */
   private async initializeUserSettings() {
     const settings = await this.$accountSettings();
-    this.activeDid = settings.activeDid || "";
+
+    // Get activeDid from active_identity table (single source of truth)
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const activeIdentity = await (this as any).$getActiveIdentity();
+    this.activeDid = activeIdentity.activeDid || "";
+
     this.apiServer = settings.apiServer || "";
     this.isRegistered = !!settings.isRegistered;
     this.givenName = settings.firstName || "";
diff --git a/src/views/QuickActionBvcEndView.vue b/src/views/QuickActionBvcEndView.vue
index 6db87141..f1d00edf 100644
--- a/src/views/QuickActionBvcEndView.vue
+++ b/src/views/QuickActionBvcEndView.vue
@@ -236,7 +236,11 @@ export default class QuickActionBvcEndView extends Vue {
 
     const settings = await this.$accountSettings();
     this.apiServer = settings.apiServer || "";
-    this.activeDid = settings.activeDid || "";
+
+    // Get activeDid from active_identity table (single source of truth)
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const activeIdentity = await (this as any).$getActiveIdentity();
+    this.activeDid = activeIdentity.activeDid || "";
 
     this.allContacts = await this.$contacts();
 
diff --git a/src/views/RecentOffersToUserProjectsView.vue b/src/views/RecentOffersToUserProjectsView.vue
index c294d053..9c7d9e14 100644
--- a/src/views/RecentOffersToUserProjectsView.vue
+++ b/src/views/RecentOffersToUserProjectsView.vue
@@ -124,7 +124,12 @@ export default class RecentOffersToUserView extends Vue {
     try {
       const settings = await this.$accountSettings();
       this.apiServer = settings.apiServer || "";
-      this.activeDid = settings.activeDid || "";
+
+      // Get activeDid from active_identity table (single source of truth)
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const activeIdentity = await (this as any).$getActiveIdentity();
+      this.activeDid = activeIdentity.activeDid || "";
+
       this.lastAckedOfferToUserProjectsJwtId =
         settings.lastAckedOfferToUserProjectsJwtId || "";
 
diff --git a/src/views/RecentOffersToUserView.vue b/src/views/RecentOffersToUserView.vue
index 5996f7ce..4946f596 100644
--- a/src/views/RecentOffersToUserView.vue
+++ b/src/views/RecentOffersToUserView.vue
@@ -116,7 +116,12 @@ export default class RecentOffersToUserView extends Vue {
     try {
       const settings = await this.$accountSettings();
       this.apiServer = settings.apiServer || "";
-      this.activeDid = settings.activeDid || "";
+
+      // Get activeDid from active_identity table (single source of truth)
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const activeIdentity = await (this as any).$getActiveIdentity();
+      this.activeDid = activeIdentity.activeDid || "";
+
       this.lastAckedOfferToUserJwtId = settings.lastAckedOfferToUserJwtId || "";
 
       this.allContacts = await this.$getAllContacts();
diff --git a/src/views/SharedPhotoView.vue b/src/views/SharedPhotoView.vue
index 6b4bec29..f9cf8d68 100644
--- a/src/views/SharedPhotoView.vue
+++ b/src/views/SharedPhotoView.vue
@@ -175,8 +175,10 @@ export default class SharedPhotoView extends Vue {
     this.notify = createNotifyHelpers(this.$notify);
 
     try {
-      const settings = await this.$accountSettings();
-      this.activeDid = settings.activeDid;
+      // Get activeDid from active_identity table (single source of truth)
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const activeIdentity = await (this as any).$getActiveIdentity();
+      this.activeDid = activeIdentity.activeDid;
 
       const temp = await this.$getTemp(SHARED_PHOTO_BASE64_KEY);
       const imageB64 = temp?.blobB64 as string;
diff --git a/src/views/TestView.vue b/src/views/TestView.vue
index f6f1888d..ef602468 100644
--- a/src/views/TestView.vue
+++ b/src/views/TestView.vue
@@ -652,7 +652,12 @@ export default class Help extends Vue {
       });
 
       // Update component state
-      this.activeDid = settings.activeDid || "";
+
+      // Get activeDid from active_identity table (single source of truth)
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const activeIdentity = await (this as any).$getActiveIdentity();
+      this.activeDid = activeIdentity.activeDid || "";
+
       this.apiServer = settings.apiServer || "";
       this.partnerApiServer = settings.partnerApiServer || "";
       this.userName = settings.firstName;
diff --git a/src/views/UserProfileView.vue b/src/views/UserProfileView.vue
index 16cb308b..ac88487e 100644
--- a/src/views/UserProfileView.vue
+++ b/src/views/UserProfileView.vue
@@ -183,7 +183,12 @@ export default class UserProfileView extends Vue {
    */
   private async initializeSettings() {
     const settings = await this.$accountSettings();
-    this.activeDid = settings.activeDid || "";
+
+    // Get activeDid from active_identity table (single source of truth)
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const activeIdentity = await (this as any).$getActiveIdentity();
+    this.activeDid = activeIdentity.activeDid || "";
+
     this.partnerApiServer = settings.partnerApiServer || this.partnerApiServer;
   }