fix(api): prevent duplicate feed and search requests

Add concurrency guards to prevent duplicate API requests when methods are called multiple times before completion. - HomeView.updateAllFeed(): guard against concurrent calls with retry count limit to prevent infinite recursion - DiscoverView.searchAll(): guard initial searches while allowing concurrent pagination - DiscoverView.searchStarred(): guard against concurrent calls These changes prevent duplicate network requests while preserving legitimate concurrent pagination behavior.
2025-10-29 11:37:09 +00:00
18 changed files with 497 additions and 684 deletions
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -9,10 +9,6 @@ echo "🔍 Running pre-commit hooks..."

 # Run lint-fix first
 echo "📝 Running lint-fix..."
-
-# Capture git status before lint-fix to detect changes
-git_status_before=$(git status --porcelain)
-
 npm run lint-fix || {
    echo
    echo "❌ Linting failed. Please fix the issues and try again."
@@ -22,36 +18,6 @@ npm run lint-fix || {
    exit 1
 }

-# Check if lint-fix made any changes
-git_status_after=$(git status --porcelain)
-
-if [ "$git_status_before" != "$git_status_after" ]; then
-    echo
-    echo "⚠️  lint-fix made changes to your files!"
-    echo "📋 Changes detected:"
-    git diff --name-only
-    echo
-    echo "❓ What would you like to do?"
-    echo "   [c] Continue commit without the new changes"
-    echo "   [a] Abort commit (recommended - review and stage the changes)"
-    echo
-    printf "Choose [c/a]: "
-    # The `< /dev/tty` is necessary to make read work in git's non-interactive shell
-    read choice < /dev/tty
-    
-    case $choice in
-        [Cc]* )
-            echo "✅ Continuing commit without lint-fix changes..."
-            sleep 3
-            ;;
-        [Aa]* | * )
-            echo "🛑 Commit aborted. Please review the changes made by lint-fix."
-            echo "💡 You can stage the changes with 'git add .' and commit again."
-            exit 1
-            ;;
-    esac
-fi
-
 # Then run Build Architecture Guard

 #echo "🏗️  Running Build Architecture Guard..."
--- a/src/assets/styles/tailwind.css
+++ b/src/assets/styles/tailwind.css
@@ -38,7 +38,7 @@
 	}

 	.dialog {
-		@apply bg-white px-4 py-6 rounded-lg w-full max-w-lg max-h-[90%] overflow-y-auto;
+		@apply bg-white p-4 rounded-lg w-full max-w-lg;
 	}

 	/* Markdown content styling to restore list elements */
--- a/src/components/FeedFilters.vue
+++ b/src/components/FeedFilters.vue
@@ -211,6 +211,8 @@ export default class FeedFilters extends Vue {
 }
 </script>

-<style scoped>
-/* Component-specific styles if needed */
+<style>
+#dialogFeedFilters.dialog-overlay {
+  overflow: scroll;
+}
 </style>
--- a/src/components/MembersList.vue
+++ b/src/components/MembersList.vue
@@ -1,255 +1,197 @@
 <template>
-  <div>
-    <div class="space-y-4">
-      <!-- Loading State -->
-      <div
-        v-if="isLoading"
-        class="mt-16 text-center text-4xl bg-slate-400 text-white w-14 py-2.5 rounded-full mx-auto"
-      >
-        <font-awesome icon="spinner" class="fa-spin-pulse" />
-      </div>
-
-      <!-- Members List -->
-
-      <div v-else>
-        <div class="text-center text-red-600 my-4">
-          {{ decryptionErrorMessage() }}
-        </div>
-
-        <div v-if="missingMyself" class="py-4 text-red-600">
-          You are not currently admitted by the organizer.
-        </div>
-        <div v-if="!firstName" class="py-4 text-red-600">
-          Your name is not set, so others may not recognize you. Reload this
-          page to set it.
-        </div>
-
-        <ul class="list-disc text-sm ps-4 space-y-2 mb-4">
-          <li
-            v-if="
-              membersToShow().length > 0 && showOrganizerTools && isOrganizer
-            "
-          >
-            Click
-            <font-awesome icon="circle-plus" class="text-blue-500 text-sm" />
-            /
-            <font-awesome icon="circle-minus" class="text-rose-500 text-sm" />
-            to add/remove them to/from the meeting.
-          </li>
-          <li
-            v-if="
-              membersToShow().length > 0 && getNonContactMembers().length > 0
-            "
-          >
-            Click
-            <font-awesome icon="circle-user" class="text-green-600 text-sm" />
-            to add them to your contacts.
-          </li>
-        </ul>
-
-        <div class="flex justify-between">
-          <!-- 
-        always have at least one refresh button even without members in case the organizer 
-         changes the password 
-         -->
-          <button
-            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-3 py-1.5 rounded-md"
-            title="Refresh members list now"
-            @click="refreshData(false)"
-          >
-            <font-awesome icon="rotate" :class="{ 'fa-spin': isLoading }" />
-            Refresh
-            <span class="text-xs">({{ countdownTimer }}s)</span>
-          </button>
-        </div>
-        <ul
-          v-if="membersToShow().length > 0"
-          class="border-t border-slate-300 my-2"
-        >
-          <li
-            v-for="member in membersToShow()"
-            :key="member.member.memberId"
-            :class="[
-              'border-b px-2 sm:px-3 py-1.5',
-              {
-                'bg-blue-50 border-t border-blue-300 -mt-[1px]':
-                  !member.member.admitted &&
-                  (isOrganizer || member.did === activeDid),
-              },
-              { 'border-slate-300': member.member.admitted },
-            ]"
-          >
-            <div class="flex items-center gap-2 justify-between">
-              <div class="flex items-center gap-1 overflow-hidden">
-                <h3
-                  :class="[
-                    'font-semibold truncate',
-                    {
-                      'text-slate-500':
-                        !member.member.admitted &&
-                        (isOrganizer || member.did === activeDid),
-                    },
-                  ]"
-                >
-                  <font-awesome
-                    v-if="member.member.memberId === members[0]?.memberId"
-                    icon="crown"
-                    class="fa-fw text-amber-400"
-                  />
-                  <font-awesome
-                    v-if="member.did === activeDid"
-                    icon="hand"
-                    class="fa-fw text-slate-500"
-                  />
-                  <font-awesome
-                    v-if="
-                      !member.member.admitted &&
-                      (isOrganizer || member.did === activeDid)
-                    "
-                    icon="hourglass-half"
-                    class="fa-fw text-slate-400"
-                  />
-                  {{ member.name || unnamedMember }}
-                </h3>
-                <div
-                  v-if="!getContactFor(member.did) && member.did !== activeDid"
-                  class="flex items-center gap-1.5 ml-2 ms-1"
-                >
-                  <button
-                    class="btn-add-contact ml-2"
-                    title="Add as contact"
-                    @click="addAsContact(member)"
-                  >
-                    <font-awesome icon="circle-user" />
-                  </button>
-
-                  <button
-                    class="btn-info-contact ml-2"
-                    title="Contact Info"
-                    @click="
-                      informAboutAddingContact(
-                        getContactFor(member.did) !== undefined,
-                      )
-                    "
-                  >
-                    <font-awesome icon="circle-info" />
-                  </button>
-                </div>
-                <div
-                  v-if="getContactFor(member.did) && member.did !== activeDid"
-                  class="flex items-center gap-1.5 ms-1"
-                >
-                  <router-link
-                    :to="{ name: 'contact-edit', params: { did: member.did } }"
-                  >
-                    <font-awesome
-                      icon="pen"
-                      class="text-sm text-blue-500 ml-2 mb-1"
-                    />
-                  </router-link>
-                  <router-link
-                    :to="{ name: 'did', params: { did: member.did } }"
-                  >
-                    <font-awesome
-                      icon="arrow-up-right-from-square"
-                      class="text-sm text-blue-500 ml-2 mb-1"
-                    />
-                  </router-link>
-                </div>
-              </div>
-              <span
-                v-if="
-                  showOrganizerTools && isOrganizer && member.did !== activeDid
-                "
-                class="flex items-center gap-1.5"
-              >
-                <button
-                  :class="
-                    member.member.admitted
-                      ? 'btn-admission-remove'
-                      : 'btn-admission-add'
-                  "
-                  :title="
-                    member.member.admitted ? 'Remove member' : 'Admit member'
-                  "
-                  @click="checkWhetherContactBeforeAdmitting(member)"
-                >
-                  <font-awesome
-                    :icon="
-                      member.member.admitted ? 'circle-minus' : 'circle-plus'
-                    "
-                  />
-                </button>
-
-                <button
-                  class="btn-info-admission"
-                  title="Admission Info"
-                  @click="informAboutAdmission()"
-                >
-                  <font-awesome icon="circle-info" />
-                </button>
-              </span>
-            </div>
-            <p class="text-xs text-gray-600 truncate">
-              {{ member.did }}
-            </p>
-          </li>
-        </ul>
-
-        <div v-if="membersToShow().length > 0" class="flex justify-between">
-          <!-- 
-        always have at least one refresh button even without members in case the organizer 
-         changes the password 
-         -->
-          <button
-            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-3 py-1.5 rounded-md"
-            title="Refresh members list now"
-            @click="refreshData(false)"
-          >
-            <font-awesome icon="rotate" :class="{ 'fa-spin': isLoading }" />
-            Refresh
-            <span class="text-xs">({{ countdownTimer }}s)</span>
-          </button>
-        </div>
-
-        <p v-if="members.length === 0" class="text-gray-500 py-4">
-          No members have joined this meeting yet
-        </p>
-      </div>
+  <div class="space-y-4">
+    <!-- Loading State -->
+    <div
+      v-if="isLoading"
+      class="mt-16 text-center text-4xl bg-slate-400 text-white w-14 py-2.5 rounded-full mx-auto"
+    >
+      <font-awesome icon="spinner" class="fa-spin-pulse" />
    </div>

-    <!-- Bulk Members Dialog for both admitting and setting visibility -->
-    <BulkMembersDialog
-      ref="bulkMembersDialog"
-      :active-did="activeDid"
-      :api-server="apiServer"
-      :is-organizer="isOrganizer"
-      @close="closeBulkMembersDialogCallback"
-    />
+    <!-- Members List -->
+
+    <div v-else>
+      <div class="text-center text-red-600 my-4">
+        {{ decryptionErrorMessage() }}
+      </div>
+
+      <div v-if="missingMyself" class="py-4 text-red-600">
+        You are not currently admitted by the organizer.
+      </div>
+      <div v-if="!firstName" class="py-4 text-red-600">
+        Your name is not set, so others may not recognize you. Reload this page
+        to set it.
+      </div>
+
+      <ul class="list-disc text-sm ps-4 space-y-2 mb-4">
+        <li
+          v-if="membersToShow().length > 0 && showOrganizerTools && isOrganizer"
+        >
+          Click
+          <span
+            class="inline-block w-5 h-5 rounded-full bg-blue-100 text-blue-600 text-center"
+          >
+            <font-awesome icon="plus" class="text-sm" />
+          </span>
+          /
+          <span
+            class="inline-block w-5 h-5 rounded-full bg-blue-100 text-blue-600 text-center"
+          >
+            <font-awesome icon="minus" class="text-sm" />
+          </span>
+          to add/remove them to/from the meeting.
+        </li>
+        <li v-if="membersToShow().length > 0">
+          Click
+          <span
+            class="inline-block w-5 h-5 rounded-full bg-green-100 text-green-600 text-center"
+          >
+            <font-awesome icon="circle-user" class="text-sm" />
+          </span>
+          to add them to your contacts.
+        </li>
+      </ul>
+
+      <div class="flex justify-between">
+        <!-- 
+        always have at least one refresh button even without members in case the organizer 
+         changes the password 
+         -->
+        <button
+          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-3 py-1.5 rounded-md"
+          title="Refresh members list now"
+          @click="manualRefresh"
+        >
+          <font-awesome icon="rotate" :class="{ 'fa-spin': isLoading }" />
+          Refresh
+          <span class="text-xs">({{ countdownTimer }}s)</span>
+        </button>
+      </div>
+      <ul
+        v-if="membersToShow().length > 0"
+        class="border-t border-slate-300 my-2"
+      >
+        <li
+          v-for="member in membersToShow()"
+          :key="member.member.memberId"
+          class="border-b border-slate-300 py-1.5"
+        >
+          <div class="flex items-center gap-2 justify-between">
+            <div class="flex items-center gap-1 overflow-hidden">
+              <h3 class="font-semibold truncate">
+                {{ member.name || unnamedMember }}
+              </h3>
+              <div
+                v-if="!getContactFor(member.did) && member.did !== activeDid"
+                class="flex items-center gap-1"
+              >
+                <button
+                  class="btn-add-contact"
+                  title="Add as contact"
+                  @click="addAsContact(member)"
+                >
+                  <font-awesome icon="circle-user" />
+                </button>
+
+                <button
+                  class="btn-info-contact"
+                  title="Contact Info"
+                  @click="
+                    informAboutAddingContact(
+                      getContactFor(member.did) !== undefined,
+                    )
+                  "
+                >
+                  <font-awesome icon="circle-info" class="text-sm" />
+                </button>
+              </div>
+            </div>
+            <span
+              v-if="
+                showOrganizerTools && isOrganizer && member.did !== activeDid
+              "
+              class="flex items-center gap-1"
+            >
+              <button
+                class="btn-admission"
+                :title="
+                  member.member.admitted ? 'Remove member' : 'Admit member'
+                "
+                @click="checkWhetherContactBeforeAdmitting(member)"
+              >
+                <font-awesome
+                  :icon="member.member.admitted ? 'minus' : 'plus'"
+                />
+              </button>
+
+              <button
+                class="btn-info-admission"
+                title="Admission Info"
+                @click="informAboutAdmission()"
+              >
+                <font-awesome icon="circle-info" class="text-sm" />
+              </button>
+            </span>
+          </div>
+          <p class="text-xs text-gray-600 truncate">
+            {{ member.did }}
+          </p>
+        </li>
+      </ul>
+
+      <div v-if="membersToShow().length > 0" class="flex justify-between">
+        <!-- 
+        always have at least one refresh button even without members in case the organizer 
+         changes the password 
+         -->
+        <button
+          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-3 py-1.5 rounded-md"
+          title="Refresh members list now"
+          @click="manualRefresh"
+        >
+          <font-awesome icon="rotate" :class="{ 'fa-spin': isLoading }" />
+          Refresh
+          <span class="text-xs">({{ countdownTimer }}s)</span>
+        </button>
+      </div>
+
+      <p v-if="members.length === 0" class="text-gray-500 py-4">
+        No members have joined this meeting yet
+      </p>
+    </div>
  </div>
+
+  <!-- Set Visibility Dialog Component -->
+  <SetBulkVisibilityDialog
+    :visible="showSetVisibilityDialog"
+    :members-data="visibilityDialogMembers"
+    :active-did="activeDid"
+    :api-server="apiServer"
+    @close="closeSetVisibilityDialog"
+  />
 </template>

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

-import { NotificationIface } from "@/constants/app";
-import {
-  NOTIFY_ADD_CONTACT_FIRST,
-  NOTIFY_CONTINUE_WITHOUT_ADDING,
-} from "@/constants/notifications";
-import { SOMEONE_UNNAMED } from "@/constants/entities";
 import {
  errorStringForLog,
  getHeaders,
  register,
  serverMessageForUser,
-} from "@/libs/endorserServer";
-import { decryptMessage } from "@/libs/crypto";
-import { Contact } from "@/db/tables/contacts";
-import { MemberData } from "@/interfaces";
+} from "../libs/endorserServer";
+import { decryptMessage } from "../libs/crypto";
+import { Contact } from "../db/tables/contacts";
+import * as libsUtil from "../libs/util";
+import { NotificationIface } from "../constants/app";
 import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
 import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
-import BulkMembersDialog from "./BulkMembersDialog.vue";
+import {
+  NOTIFY_ADD_CONTACT_FIRST,
+  NOTIFY_CONTINUE_WITHOUT_ADDING,
+} from "@/constants/notifications";
+import { SOMEONE_UNNAMED } from "@/constants/entities";
+import SetBulkVisibilityDialog from "./SetBulkVisibilityDialog.vue";

 interface Member {
  admitted: boolean;
@@ -266,7 +208,7 @@ interface DecryptedMember {

@Component({
  components: {
-    BulkMembersDialog,
+    SetBulkVisibilityDialog,
  },
  mixins: [PlatformServiceMixin],
 })
@@ -274,6 +216,7 @@ export default class MembersList extends Vue {
  $notify!: (notification: NotificationIface, timeout?: number) => void;

  notify!: ReturnType<typeof createNotifyHelpers>;
+  libsUtil = libsUtil;

  @Prop({ required: true }) password!: string;
  @Prop({ default: false }) showOrganizerTools!: boolean;
@@ -284,7 +227,6 @@ export default class MembersList extends Vue {
    return message;
  }

-  contacts: Array<Contact> = [];
  decryptedMembers: DecryptedMember[] = [];
  firstName = "";
  isLoading = true;
@@ -295,11 +237,23 @@ export default class MembersList extends Vue {
  activeDid = "";
  apiServer = "";

+  // Set Visibility Dialog state
+  showSetVisibilityDialog = false;
+  visibilityDialogMembers: Array<{
+    did: string;
+    name: string;
+    isContact: boolean;
+    member: { memberId: string };
+  }> = [];
+  contacts: Array<Contact> = [];
+
  // Auto-refresh functionality
  countdownTimer = 10;
  autoRefreshInterval: NodeJS.Timeout | null = null;
  lastRefreshTime = 0;
-  previousMemberDidsIgnored: string[] = [];
+
+  // Track previous visibility members to detect changes
+  previousVisibilityMembers: string[] = [];

  /**
   * Get the unnamed member constant
@@ -320,8 +274,23 @@ export default class MembersList extends Vue {

    this.apiServer = settings.apiServer || "";
    this.firstName = settings.firstName || "";
+    await this.fetchMembers();
+    await this.loadContacts();

-    this.refreshData();
+    // Start auto-refresh
+    this.startAutoRefresh();
+
+    // Check if we should show the visibility dialog on initial load
+    this.checkAndShowVisibilityDialog();
+  }
+
+  async refreshData() {
+    // Force refresh both contacts and members
+    await this.loadContacts();
+    await this.fetchMembers();
+
+    // Check if we should show the visibility dialog after refresh
+    this.checkAndShowVisibilityDialog();
  }

  async fetchMembers() {
@@ -367,10 +336,7 @@ export default class MembersList extends Vue {
        const content = JSON.parse(decryptedContent);

        this.decryptedMembers.push({
-          member: {
-            ...member,
-            admitted: member.admitted !== undefined ? member.admitted : true, // Default to true for non-organizers
-          },
+          member: member,
          name: content.name,
          did: content.did,
          isRegistered: !!content.isRegistered,
@@ -412,76 +378,17 @@ export default class MembersList extends Vue {
  }

  membersToShow(): DecryptedMember[] {
-    let members: DecryptedMember[] = [];
-
    if (this.isOrganizer) {
      if (this.showOrganizerTools) {
-        members = this.decryptedMembers;
+        return this.decryptedMembers;
      } else {
-        members = this.decryptedMembers.filter(
+        return this.decryptedMembers.filter(
          (member: DecryptedMember) => member.member.admitted,
        );
      }
-    } else {
-      // non-organizers only get visible members from server, plus themselves
-
-      // Check if current user is already in the decrypted members list
-      if (
-        !this.decryptedMembers.find((member) => member.did === this.activeDid)
-      ) {
-        // this is a stub for this user just in case they are waiting to get in
-        // which is especially useful so they can see their own DID
-        const currentUser: DecryptedMember = {
-          member: {
-            admitted: false,
-            content: "{}",
-            memberId: -1,
-          },
-          name: this.firstName,
-          did: this.activeDid,
-          isRegistered: false,
-        };
-        members = [currentUser, ...this.decryptedMembers];
-      } else {
-        members = this.decryptedMembers;
-      }
    }
-
-    // Sort members according to priority:
-    // 1. Organizer at the top
-    // 2. Current user next
-    // 3. Non-admitted members next
-    // 4. Everyone else after
-    return members.sort((a, b) => {
-      // Check if either member is the organizer (first member in original list)
-      const aIsOrganizer = a.member.memberId === this.members[0]?.memberId;
-      const bIsOrganizer = b.member.memberId === this.members[0]?.memberId;
-
-      // Check if either member is the current user
-      const aIsCurrentUser = a.did === this.activeDid;
-      const bIsCurrentUser = b.did === this.activeDid;
-
-      // Organizer always comes first
-      if (aIsOrganizer && !bIsOrganizer) return -1;
-      if (!aIsOrganizer && bIsOrganizer) return 1;
-
-      // If both are organizers, maintain original order
-      if (aIsOrganizer && bIsOrganizer) return 0;
-
-      // Current user comes second (after organizer)
-      if (aIsCurrentUser && !bIsCurrentUser && !bIsOrganizer) return -1;
-      if (!aIsCurrentUser && bIsCurrentUser && !aIsOrganizer) return 1;
-
-      // If both are current users, maintain original order
-      if (aIsCurrentUser && bIsCurrentUser) return 0;
-
-      // Non-admitted members come before admitted members
-      if (!a.member.admitted && b.member.admitted) return -1;
-      if (a.member.admitted && !b.member.admitted) return 1;
-
-      // If admission status is the same, maintain original order
-      return 0;
-    });
+    // non-organizers only get visible members from server
+    return this.decryptedMembers;
  }

  informAboutAdmission() {
@@ -505,85 +412,92 @@ export default class MembersList extends Vue {
    }
  }

+  async loadContacts() {
+    this.contacts = await this.$getAllContacts();
+  }
+
  getContactFor(did: string): Contact | undefined {
    return this.contacts.find((contact) => contact.did === did);
  }

-  getPendingMembersToAdmit(): MemberData[] {
+  getMembersForVisibility() {
    return this.decryptedMembers
-      .filter(
-        (member) => member.did !== this.activeDid && !member.member.admitted,
-      )
-      .map(this.convertDecryptedMemberToMemberData);
-  }
+      .filter((member) => {
+        // Exclude the current user
+        if (member.did === this.activeDid) {
+          return false;
+        }

-  getNonContactMembers(): MemberData[] {
-    return this.decryptedMembers
-      .filter(
-        (member) =>
-          member.did !== this.activeDid && !this.getContactFor(member.did),
-      )
-      .map(this.convertDecryptedMemberToMemberData);
-  }
+        const contact = this.getContactFor(member.did);

-  convertDecryptedMemberToMemberData(
-    decryptedMember: DecryptedMember,
-  ): MemberData {
-    return {
-      did: decryptedMember.did,
-      name: decryptedMember.name,
-      isContact: !!this.getContactFor(decryptedMember.did),
-      member: {
-        memberId: decryptedMember.member.memberId.toString(),
-      },
-    };
+        // Include members who:
+        // 1. Haven't been added as contacts yet, OR
+        // 2. Are contacts but don't have visibility set (seesMe property)
+        return !contact || !contact.seesMe;
+      })
+      .map((member) => ({
+        did: member.did,
+        name: member.name,
+        isContact: !!this.getContactFor(member.did),
+        member: {
+          memberId: member.member.memberId.toString(),
+        },
+      }));
  }

  /**
-   * Show the bulk members dialog if conditions are met
-   * (admit pending members for organizers, add to contacts for non-organizers)
+   * Check if we should show the visibility dialog
+   * Returns true if there are members for visibility and either:
+   * - This is the first time (no previous members tracked), OR
+   * - New members have been added since last check (not removed)
   */
-  async refreshData(bypassPromptIfAllWereIgnored = true) {
-    // Force refresh both contacts and members
-    this.contacts = await this.$getAllContacts();
-    await this.fetchMembers();
+  shouldShowVisibilityDialog(): boolean {
+    const currentMembers = this.getMembersForVisibility();

-    const pendingMembers = this.isOrganizer
-      ? this.getPendingMembersToAdmit()
-      : this.getNonContactMembers();
-    if (pendingMembers.length === 0) {
-      this.startAutoRefresh();
-      return;
+    if (currentMembers.length === 0) {
+      return false;
    }
-    if (bypassPromptIfAllWereIgnored) {
-      // only show if there are members that have not been ignored
-      const pendingMembersNotIgnored = pendingMembers.filter(
-        (member) => !this.previousMemberDidsIgnored.includes(member.did),
-      );
-      if (pendingMembersNotIgnored.length === 0) {
-        this.startAutoRefresh();
-        // everyone waiting has been ignored
-        return;
-      }
+
+    // If no previous members tracked, show dialog
+    if (this.previousVisibilityMembers.length === 0) {
+      return true;
    }
-    this.stopAutoRefresh();
-    (this.$refs.bulkMembersDialog as BulkMembersDialog).open(pendingMembers);
+
+    // Check if new members have been added (not just any change)
+    const currentMemberIds = currentMembers.map((m) => m.did);
+    const previousMemberIds = this.previousVisibilityMembers;
+
+    // Find new members (members in current but not in previous)
+    const newMembers = currentMemberIds.filter(
+      (id) => !previousMemberIds.includes(id),
+    );
+
+    // Only show dialog if there are new members added
+    return newMembers.length > 0;
  }

-  // Bulk Members Dialog methods
-  async closeBulkMembersDialogCallback(
-    result: { notSelectedMemberDids: string[] } | undefined,
-  ) {
-    this.previousMemberDidsIgnored = result?.notSelectedMemberDids || [];
+  /**
+   * Update the tracking of previous visibility members
+   */
+  updatePreviousVisibilityMembers() {
+    const currentMembers = this.getMembersForVisibility();
+    this.previousVisibilityMembers = currentMembers.map((m) => m.did);
+  }

-    await this.refreshData();
+  /**
+   * Show the visibility dialog if conditions are met
+   */
+  checkAndShowVisibilityDialog() {
+    if (this.shouldShowVisibilityDialog()) {
+      this.showSetBulkVisibilityDialog();
+    }
+    this.updatePreviousVisibilityMembers();
  }

  checkWhetherContactBeforeAdmitting(decrMember: DecryptedMember) {
    const contact = this.getContactFor(decrMember.did);
    if (!decrMember.member.admitted && !contact) {
-      // If not a contact, stop auto-refresh and show confirmation dialog
-      this.stopAutoRefresh();
+      // If not a contact, show confirmation dialog
      this.$notify(
        {
          group: "modal",
@@ -596,7 +510,6 @@ export default class MembersList extends Vue {
            await this.addAsContact(decrMember);
            // After adding as contact, proceed with admission
            await this.toggleAdmission(decrMember);
-            this.startAutoRefresh();
          },
          onNo: async () => {
            // If they choose not to add as contact, show second confirmation
@@ -609,19 +522,14 @@ export default class MembersList extends Vue {
                yesText: NOTIFY_CONTINUE_WITHOUT_ADDING.yesText,
                onYes: async () => {
                  await this.toggleAdmission(decrMember);
-                  this.startAutoRefresh();
                },
                onCancel: async () => {
                  // Do nothing, effectively canceling the operation
-                  this.startAutoRefresh();
                },
              },
              TIMEOUTS.MODAL,
            );
          },
-          onCancel: async () => {
-            this.startAutoRefresh();
-          },
        },
        TIMEOUTS.MODAL,
      );
@@ -724,8 +632,19 @@ export default class MembersList extends Vue {
    }
  }

-  startAutoRefresh() {
+  showSetBulkVisibilityDialog() {
+    // Filter members to show only those who need visibility set
+    const membersForVisibility = this.getMembersForVisibility();
+
+    // Pause auto-refresh when dialog opens
    this.stopAutoRefresh();
+
+    // Open the dialog directly
+    this.visibilityDialogMembers = membersForVisibility;
+    this.showSetVisibilityDialog = true;
+  }
+
+  startAutoRefresh() {
    this.lastRefreshTime = Date.now();
    this.countdownTimer = 10;

@@ -755,6 +674,33 @@ export default class MembersList extends Vue {
    }
  }

+  manualRefresh() {
+    // Clear existing auto-refresh interval
+    if (this.autoRefreshInterval) {
+      clearInterval(this.autoRefreshInterval);
+      this.autoRefreshInterval = null;
+    }
+
+    // Trigger immediate refresh and restart timer
+    this.refreshData();
+    this.startAutoRefresh();
+
+    // Always show dialog on manual refresh if there are members for visibility
+    if (this.getMembersForVisibility().length > 0) {
+      this.showSetBulkVisibilityDialog();
+    }
+  }
+
+  // Set Visibility Dialog methods
+  closeSetVisibilityDialog() {
+    this.showSetVisibilityDialog = false;
+    this.visibilityDialogMembers = [];
+    // Refresh data when dialog is closed
+    this.refreshData();
+    // Resume auto-refresh when dialog is closed
+    this.startAutoRefresh();
+  }
+
  beforeDestroy() {
    this.stopAutoRefresh();
  }
@@ -772,26 +718,23 @@ export default class MembersList extends Vue {

 .btn-add-contact {
  /* stylelint-disable-next-line at-rule-no-unknown */
-  @apply text-lg text-green-600 hover:text-green-800 
+  @apply w-6 h-6 flex items-center justify-center rounded-full 
+    bg-green-100 text-green-600 hover:bg-green-200 hover:text-green-800 
    transition-colors;
 }

 .btn-info-contact,
 .btn-info-admission {
  /* stylelint-disable-next-line at-rule-no-unknown */
-  @apply text-slate-400 hover:text-slate-600 
+  @apply w-6 h-6 flex items-center justify-center rounded-full 
+    bg-slate-100 text-slate-400 hover:text-slate-600 
    transition-colors;
 }

-.btn-admission-add {
+.btn-admission {
  /* stylelint-disable-next-line at-rule-no-unknown */
-  @apply text-lg text-blue-500 hover:text-blue-700 
-    transition-colors;
-}
-
-.btn-admission-remove {
-  /* stylelint-disable-next-line at-rule-no-unknown */
-  @apply text-lg text-rose-500 hover:text-rose-700 
+  @apply w-6 h-6 flex items-center justify-center rounded-full 
+    bg-blue-100 text-blue-600 hover:bg-blue-200 hover:text-blue-800 
    transition-colors;
 }
 </style>
--- a/src/components/SetBulkVisibilityDialog.vue
+++ b/src/components/SetBulkVisibilityDialog.vue
@@ -3,18 +3,18 @@
    <div class="dialog">
      <div class="text-slate-900 text-center">
        <h3 class="text-lg font-semibold leading-[1.25] mb-2">
-          {{ title }}
+          Set Visibility to Meeting Members
        </h3>
        <p class="text-sm mb-4">
-          {{ description }}
+          Would you like to <b>make your activities visible</b> to the following
+          members? (This will also add them as contacts if they aren't already.)
        </p>

-        <!-- Member Selection Table -->
-        <div class="mb-4">
+        <!-- Custom table area - you can customize this -->
+        <div v-if="shouldInitializeSelection" class="mb-4">
          <table
            class="w-full border-collapse border border-slate-300 text-sm text-start"
          >
-            <!-- Select All Header -->
            <thead v-if="membersData && membersData.length > 0">
              <tr class="bg-slate-100 font-medium">
                <th class="border border-slate-300 px-3 py-2">
@@ -31,15 +31,14 @@
              </tr>
            </thead>
            <tbody>
-              <!-- Empty State -->
+              <!-- Dynamic data from MembersList -->
              <tr v-if="!membersData || membersData.length === 0">
                <td
                  class="border border-slate-300 px-3 py-2 text-center italic text-gray-500"
                >
-                  {{ emptyStateText }}
+                  No members need visibility settings
                </td>
              </tr>
-              <!-- Member Rows -->
              <tr
                v-for="member in membersData || []"
                :key="member.member.memberId"
@@ -52,24 +51,10 @@
                        :checked="isMemberSelected(member.did)"
                        @change="toggleMemberSelection(member.did)"
                      />
-                      <div class="">
-                        <div class="text-sm font-semibold">
-                          {{ member.name || SOMEONE_UNNAMED }}
-                        </div>
-                        <div
-                          class="flex items-center gap-0.5 text-xs text-slate-500"
-                        >
-                          <span class="font-semibold sm:hidden">DID:</span>
-                          <span
-                            class="w-[35vw] sm:w-auto truncate text-left"
-                            style="direction: rtl"
-                            >{{ member.did }}</span
-                          >
-                        </div>
-                      </div>
+                      {{ member.name || SOMEONE_UNNAMED }}
                    </label>

-                    <!-- Contact indicator - only show if they are already a contact -->
+                    <!-- Friend indicator - only show if they are already a contact -->
                    <font-awesome
                      v-if="member.isContact"
                      icon="user-circle"
@@ -80,28 +65,10 @@
                </td>
              </tr>
            </tbody>
-            <!-- Select All Footer -->
-            <tfoot v-if="membersData && membersData.length > 0">
-              <tr class="bg-slate-100 font-medium">
-                <th class="border border-slate-300 px-3 py-2">
-                  <label class="flex items-center gap-2">
-                    <input
-                      type="checkbox"
-                      :checked="isAllSelected"
-                      :indeterminate="isIndeterminate"
-                      @change="toggleSelectAll"
-                    />
-                    Select All
-                  </label>
-                </th>
-              </tr>
-            </tfoot>
          </table>
        </div>

-        <!-- Action Buttons -->
        <div class="space-y-2">
-          <!-- Main Action Button -->
          <button
            v-if="membersData && membersData.length > 0"
            :disabled="!hasSelectedMembers"
@@ -111,16 +78,17 @@
                ? 'bg-blue-600 text-white cursor-pointer'
                : 'bg-slate-400 text-slate-200 cursor-not-allowed',
            ]"
-            @click="processSelectedMembers"
+            @click="setVisibilityForSelectedMembers"
          >
-            {{ buttonText }}
+            Set Visibility
          </button>
-          <!-- Cancel Button -->
          <button
            class="block w-full text-center text-md font-bold uppercase bg-slate-600 text-white px-2 py-2 rounded-md"
            @click="cancel"
          >
-            Maybe Later
+            {{
+              membersData && membersData.length > 0 ? "Maybe Later" : "Cancel"
+            }}
          </button>
        </div>
      </div>
@@ -133,20 +101,26 @@ import { Vue, Component, Prop } from "vue-facing-decorator";

 import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
 import { SOMEONE_UNNAMED } from "@/constants/entities";
-import { MemberData } from "@/interfaces";
-import { setVisibilityUtil, getHeaders, register } from "@/libs/endorserServer";
+import { setVisibilityUtil } from "@/libs/endorserServer";
 import { createNotifyHelpers } from "@/utils/notify";
-import { Contact } from "@/db/tables/contacts";
+
+interface MemberData {
+  did: string;
+  name: string;
+  isContact: boolean;
+  member: {
+    memberId: string;
+  };
+}

@Component({
  mixins: [PlatformServiceMixin],
-  emits: ["close"],
 })
-export default class BulkMembersDialog extends Vue {
+export default class SetBulkVisibilityDialog extends Vue {
+  @Prop({ default: false }) visible!: boolean;
+  @Prop({ default: () => [] }) membersData!: MemberData[];
  @Prop({ default: "" }) activeDid!: string;
  @Prop({ default: "" }) apiServer!: string;
-  // isOrganizer: true = organizer mode (admit members), false = member mode (set visibility)
-  @Prop({ required: true }) isOrganizer!: boolean;

  // Vue notification system
  $notify!: (
@@ -158,9 +132,8 @@ export default class BulkMembersDialog extends Vue {
  notify!: ReturnType<typeof createNotifyHelpers>;

  // Component state
-  membersData: MemberData[] = [];
  selectedMembers: string[] = [];
-  visible = false;
+  selectionInitialized = false;

  // Constants
  // In Vue templates, imported constants need to be explicitly made available to the template
@@ -185,46 +158,29 @@ export default class BulkMembersDialog extends Vue {
    return selectedCount > 0 && selectedCount < this.membersData.length;
  }

-  get title() {
-    return this.isOrganizer
-      ? "Admit Pending Members"
-      : "Add Members to Contacts";
-  }
-
-  get description() {
-    return this.isOrganizer
-      ? "Would you like to admit these members to the meeting and add them to your contacts?"
-      : "Would you like to add these members to your contacts?";
-  }
-
-  get buttonText() {
-    return this.isOrganizer ? "Admit + Add to Contacts" : "Add to Contacts";
-  }
-
-  get emptyStateText() {
-    return this.isOrganizer
-      ? "No pending members to admit"
-      : "No members are not in your contacts";
+  get shouldInitializeSelection() {
+    // This method will initialize selection when the dialog opens
+    if (!this.selectionInitialized) {
+      this.initializeSelection();
+      this.selectionInitialized = true;
+    }
+    return true;
  }

  created() {
    this.notify = createNotifyHelpers(this.$notify);
  }

-  open(members: MemberData[]) {
-    this.visible = true;
-    this.membersData = members;
+  initializeSelection() {
+    // Reset selection when dialog opens
+    this.selectedMembers = [];
    // Select all by default
    this.selectedMembers = this.membersData.map((member) => member.did);
  }

-  close(notSelectedMemberDids: string[]) {
-    this.visible = false;
-    this.$emit("close", { notSelectedMemberDids: notSelectedMemberDids });
-  }
-
-  cancel() {
-    this.close(this.membersData.map((member) => member.did));
+  resetSelection() {
+    this.selectedMembers = [];
+    this.selectionInitialized = false;
  }

  toggleSelectAll() {
@@ -252,158 +208,66 @@ export default class BulkMembersDialog extends Vue {
    return this.selectedMembers.includes(memberDid);
  }

-  async processSelectedMembers() {
+  async setVisibilityForSelectedMembers() {
    try {
-      const selectedMembers: MemberData[] = this.membersData.filter((member) =>
+      const selectedMembers = this.membersData.filter((member) =>
        this.selectedMembers.includes(member.did),
      );
-      const notSelectedMembers: MemberData[] = this.membersData.filter(
-        (member) => !this.selectedMembers.includes(member.did),
-      );

-      let admittedCount = 0;
-      let contactAddedCount = 0;
-      let errors = 0;
+      let successCount = 0;

      for (const member of selectedMembers) {
        try {
-          // Organizer mode: admit and register the member first
-          if (this.isOrganizer) {
-            await this.admitMember(member);
-            await this.registerMember(member);
-            admittedCount++;
-          }
-
-          // If they're not a contact yet, add them as a contact
+          // If they're not a contact yet, add them as a contact first
          if (!member.isContact) {
-            // Organizer mode: set isRegistered to true, member mode: undefined
-            await this.addAsContact(
-              member,
-              this.isOrganizer ? true : undefined,
-            );
-            contactAddedCount++;
+            await this.addAsContact(member);
          }

          // Set their seesMe to true
          await this.updateContactVisibility(member.did, true);
+
+          successCount++;
        } catch (error) {
          // eslint-disable-next-line no-console
          console.error(`Error processing member ${member.did}:`, error);
          // Continue with other members even if one fails
-          errors++;
        }
      }

      // Show success notification
-      if (this.isOrganizer) {
-        if (admittedCount > 0) {
-          this.$notify(
-            {
-              group: "alert",
-              type: "success",
-              title: "Members Admitted Successfully",
-              text: `${admittedCount} member${admittedCount === 1 ? "" : "s"} admitted and registered${contactAddedCount === 0 ? "" : admittedCount === contactAddedCount ? " and" : `, ${contactAddedCount}`}${contactAddedCount === 0 ? "" : ` added as contact${contactAddedCount === 1 ? "" : "s"}`}.`,
-            },
-            5000,
-          );
-        }
-        if (errors > 0) {
-          this.$notify(
-            {
-              group: "alert",
-              type: "danger",
-              title: "Error",
-              text: "Failed to fully admit some members. Work with them individually below.",
-            },
-            5000,
-          );
-        }
-      } else {
-        // Member mode: show contacts added notification
-        if (contactAddedCount > 0) {
-          this.$notify(
-            {
-              group: "alert",
-              type: "success",
-              title: "Contacts Added Successfully",
-              text: `${contactAddedCount} member${contactAddedCount === 1 ? "" : "s"} added as contact${contactAddedCount === 1 ? "" : "s"}.`,
-            },
-            5000,
-          );
-        }
-      }
+      this.$notify(
+        {
+          group: "alert",
+          type: "success",
+          title: "Visibility Set Successfully",
+          text: `Visibility set for ${successCount} member${successCount === 1 ? "" : "s"}.`,
+        },
+        5000,
+      );

-      this.close(notSelectedMembers.map((member) => member.did));
+      // Emit success event
+      this.$emit("success", successCount);
+      this.close();
    } catch (error) {
      // eslint-disable-next-line no-console
-      console.error(
-        `Error ${this.isOrganizer ? "admitting members" : "adding contacts"}:`,
-        error,
-      );
+      console.error("Error setting visibility:", error);
      this.$notify(
        {
          group: "alert",
          type: "danger",
          title: "Error",
-          text: "Some errors occurred. Work with members individually below.",
+          text: "Failed to set visibility for some members. Please try again.",
        },
        5000,
      );
    }
  }

-  async admitMember(member: {
-    did: string;
-    name: string;
-    member: { memberId: string };
-  }) {
+  async addAsContact(member: { did: string; name: string }) {
    try {
-      const headers = await getHeaders(this.activeDid);
-      await this.axios.put(
-        `${this.apiServer}/api/partner/groupOnboardMember/${member.member.memberId}`,
-        { admitted: true },
-        { headers },
-      );
-    } catch (err) {
-      // eslint-disable-next-line no-console
-      console.error("Error admitting member:", err);
-      throw err;
-    }
-  }
-
-  async registerMember(member: MemberData) {
-    try {
-      const contact: Contact = { did: member.did };
-      const result = await register(
-        this.activeDid,
-        this.apiServer,
-        this.axios,
-        contact,
-      );
-      if (result.success) {
-        if (result.embeddedRecordError) {
-          throw new Error(result.embeddedRecordError);
-        }
-        await this.$updateContact(member.did, { registered: true });
-      } else {
-        throw result;
-      }
-    } catch (err) {
-      // eslint-disable-next-line no-console
-      console.error("Error registering member:", err);
-      throw err;
-    }
-  }
-
-  async addAsContact(
-    member: { did: string; name: string },
-    isRegistered?: boolean,
-  ) {
-    try {
-      const newContact: Contact = {
+      const newContact = {
        did: member.did,
        name: member.name,
-        registered: isRegistered,
      };

      await this.$insertContact(newContact);
@@ -446,20 +310,24 @@ export default class BulkMembersDialog extends Vue {
  }

  showContactInfo() {
-    // isOrganizer: true = admit mode, false = visibility mode
-    const message = this.isOrganizer
-      ? "This user is already your contact, but they are not yet admitted to the meeting."
-      : "This user is already your contact, but your activities are not visible to them yet.";
-
    this.$notify(
      {
        group: "alert",
        type: "info",
        title: "Contact Info",
-        text: message,
+        text: "This user is already your contact, but your activities are not visible to them yet.",
      },
      5000,
    );
  }
+
+  close() {
+    this.resetSelection();
+    this.$emit("close");
+  }
+
+  cancel() {
+    this.close();
+  }
 }
 </script>
--- a/src/constants/notifications.ts
+++ b/src/constants/notifications.ts
@@ -510,6 +510,14 @@ export const NOTIFY_REGISTER_CONTACT = {
  text: "Do you want to register them?",
 };

+// Used in: ContactsView.vue (showOnboardMeetingDialog method - complex modal for onboarding meeting)
+export const NOTIFY_ONBOARDING_MEETING = {
+  title: "Onboarding Meeting",
+  text: "Would you like to start a new meeting?",
+  yesText: "Start New Meeting",
+  noText: "Join Existing Meeting",
+};
+
 // TestView.vue specific constants
 // Used in: TestView.vue (executeSql method - SQL error handling)
 export const NOTIFY_SQL_ERROR = {
--- a/src/interfaces/common.ts
+++ b/src/interfaces/common.ts
@@ -70,6 +70,15 @@ export interface AxiosErrorResponse {
  [key: string]: unknown;
 }

+export interface UserInfo {
+  did: string;
+  name: string;
+  publicEncKey: string;
+  registered: boolean;
+  profileImageUrl?: string;
+  nextPublicEncKeyHash?: string;
+}
+
 export interface CreateAndSubmitClaimResult {
  success: boolean;
  embeddedRecordError?: string;
--- a/src/interfaces/index.ts
+++ b/src/interfaces/index.ts
@@ -4,4 +4,3 @@ export * from "./common";
 export * from "./deepLinks";
 export * from "./limits";
 export * from "./records";
-export * from "./user";
--- a/src/interfaces/user.ts
+++ b/src/interfaces/user.ts
@@ -6,12 +6,3 @@ export interface UserInfo {
  profileImageUrl?: string;
  nextPublicEncKeyHash?: string;
 }
-
-export interface MemberData {
-  did: string;
-  name: string;
-  isContact: boolean;
-  member: {
-    memberId: string;
-  };
-}
--- a/src/libs/endorserServer.ts
+++ b/src/libs/endorserServer.ts
@@ -42,6 +42,9 @@ import {
  PlanActionClaim,
  RegisterActionClaim,
  TenureClaim,
+} from "../interfaces/claims";
+
+import {
  GenericCredWrapper,
  GenericVerifiableCredential,
  AxiosErrorResponse,
@@ -52,12 +55,14 @@ import {
  QuantitativeValue,
  KeyMetaWithPrivate,
  KeyMetaMaybeWithPrivate,
+} from "../interfaces/common";
+import {
  OfferSummaryRecord,
  OfferToPlanSummaryRecord,
  PlanSummaryAndPreviousClaim,
  PlanSummaryRecord,
-} from "../interfaces";
-import { logger, safeStringify } from "../utils/logger";
+} from "../interfaces/records";
+import { logger } from "../utils/logger";
 import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
 import { APP_SERVER } from "@/constants/app";
 import { SOMEONE_UNNAMED } from "@/constants/entities";
@@ -1657,35 +1662,30 @@ export async function register(
      message?: string;
    }>(url, { jwtEncoded: vcJwt });

-    if (resp.data?.success?.embeddedRecordError) {
+    if (resp.data?.success?.handleId) {
+      return { success: true };
+    } else if (resp.data?.success?.embeddedRecordError) {
      let message =
        "There was some problem with the registration and so it may not be complete.";
      if (typeof resp.data.success.embeddedRecordError === "string") {
        message += " " + resp.data.success.embeddedRecordError;
      }
      return { error: message };
-    } else if (resp.data?.success?.handleId) {
-      return { success: true };
    } else {
-      logger.error("Registration non-thrown error:", JSON.stringify(resp.data));
-      return {
-        error:
-          (resp.data?.error as { message?: string })?.message ||
-          (resp.data?.error as string) ||
-          "Got a server error when registering.",
-      };
+      logger.error("Registration error:", JSON.stringify(resp.data));
+      return { error: "Got a server error when registering." };
    }
  } catch (error: unknown) {
    if (error && typeof error === "object") {
      const err = error as AxiosErrorResponse;
      const errorMessage =
-        err.response?.data?.error?.message ||
-        err.response?.data?.error ||
-        err.message;
-      logger.error(
-        "Registration thrown error:",
-        errorMessage || JSON.stringify(err),
-      );
+        err.message ||
+        (err.response?.data &&
+        typeof err.response.data === "object" &&
+        "message" in err.response.data
+          ? (err.response.data as { message: string }).message
+          : undefined);
+      logger.error("Registration error:", errorMessage || JSON.stringify(err));
      return { error: errorMessage || "Got a server error when registering." };
    }
    return { error: "Got a server error when registering." };
--- a/src/libs/fontawesome.ts
+++ b/src/libs/fontawesome.ts
@@ -29,7 +29,6 @@ import {
  faCircle,
  faCircleCheck,
  faCircleInfo,
-  faCircleMinus,
  faCirclePlus,
  faCircleQuestion,
  faCircleRight,
@@ -38,7 +37,6 @@ import {
  faCoins,
  faComment,
  faCopy,
-  faCrown,
  faDollar,
  faDownload,
  faEllipsis,
@@ -60,7 +58,6 @@ import {
  faHand,
  faHandHoldingDollar,
  faHandHoldingHeart,
-  faHourglassHalf,
  faHouseChimney,
  faImage,
  faImagePortrait,
@@ -126,7 +123,6 @@ library.add(
  faCircle,
  faCircleCheck,
  faCircleInfo,
-  faCircleMinus,
  faCirclePlus,
  faCircleQuestion,
  faCircleRight,
@@ -135,7 +131,6 @@ library.add(
  faCoins,
  faComment,
  faCopy,
-  faCrown,
  faDollar,
  faDownload,
  faEllipsis,
@@ -157,7 +152,6 @@ library.add(
  faHand,
  faHandHoldingDollar,
  faHandHoldingHeart,
-  faHourglassHalf,
  faHouseChimney,
  faImage,
  faImagePortrait,
--- a/src/views/ContactEditView.vue
+++ b/src/views/ContactEditView.vue
@@ -346,7 +346,9 @@ export default class ContactEditView extends Vue {

    // Notify success and redirect
    this.notify.success(NOTIFY_CONTACT_SAVED.message, TIMEOUTS.STANDARD);
-    this.$router.back();
+    (this.$router as Router).push({
+      path: "/did/" + encodeURIComponent(this.contact?.did || ""),
+    });
  }
 }
 </script>
--- a/src/views/ContactsView.vue
+++ b/src/views/ContactsView.vue
@@ -171,11 +171,9 @@ import {
  CONTACT_IMPORT_ONE_URL_PATH_TIME_SAFARI,
  CONTACT_URL_PATH_ENDORSER_CH_OLD,
 } from "../libs/endorserServer";
-import {
-  GiveSummaryRecord,
-  UserInfo,
-  VerifiableCredential,
-} from "@/interfaces";
+import { GiveSummaryRecord } from "@/interfaces/records";
+import { UserInfo } from "@/interfaces/common";
+import { VerifiableCredential } from "@/interfaces/claims-result";
 import * as libsUtil from "../libs/util";
 import {
  generateSaveAndActivateIdentity,
--- a/src/views/DIDView.vue
+++ b/src/views/DIDView.vue
@@ -12,20 +12,20 @@
      </h1>

      <!-- Back -->
-      <button
+      <router-link
        class="order-first text-lg text-center leading-none p-1"
-        @click="goBack()"
+        :to="{ name: 'contacts' }"
      >
        <font-awesome icon="chevron-left" class="block text-center w-[1em]" />
-      </button>
+      </router-link>

      <!-- Help button -->
-      <button
+      <router-link
+        :to="{ name: 'help' }"
        class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
-        @click="goToHelp()"
      >
        <font-awesome icon="question" class="block text-center w-[1em]" />
-      </button>
+      </router-link>
    </div>

    <!-- Identity Details -->
@@ -476,7 +476,7 @@ export default class DIDView extends Vue {
   * Navigation helper methods
   */
  goBack() {
-    this.$router.back();
+    this.$router.go(-1);
  }

  /**
--- a/src/views/DiscoverView.vue
+++ b/src/views/DiscoverView.vue
@@ -536,6 +536,14 @@ export default class DiscoverView extends Vue {
  }

  public async searchAll(beforeId?: string) {
+    // Guard against concurrent calls (allow pagination concurrent calls)
+    if (this.isLoading && !beforeId) {
+      logger.debug(
+        "[DiscoverView] ⚠️ searchAll() already in progress, skipping",
+      );
+      return;
+    }
+
    this.resetCounts();

    if (!beforeId) {
@@ -601,6 +609,14 @@ export default class DiscoverView extends Vue {
  }

  public async searchStarred() {
+    // Guard against concurrent calls
+    if (this.isLoading) {
+      logger.debug(
+        "[DiscoverView] ⚠️ searchStarred() already in progress, skipping",
+      );
+      return;
+    }
+
    this.resetCounts();

    // Clear any previous results
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -1091,17 +1091,27 @@ export default class HomeView extends Vue {
   * - this.feedData (via processFeedResults)
   * - this.feedLastViewedClaimId (via updateFeedLastViewedId)
   */
-  async updateAllFeed() {
+  async updateAllFeed(retryCount: number = 0) {
+    // Guard against concurrent calls (but allow retries)
+    if (this.isFeedLoading && retryCount === 0) {
+      logger.debug(
+        "[HomeView] ⚠️ updateAllFeed() already in progress, skipping",
+      );
+      return;
+    }
+
    logger.debug("[HomeView] 🚀 updateAllFeed() called", {
      isFeedLoading: this.isFeedLoading,
      currentFeedDataLength: this.feedData.length,
      isAnyFeedFilterOn: this.isAnyFeedFilterOn,
      isFeedFilteredByVisible: this.isFeedFilteredByVisible,
      isFeedFilteredByNearby: this.isFeedFilteredByNearby,
+      retryCount,
    });

    this.isFeedLoading = true;
    let endOfResults = true;
+    const MAX_RETRIES = 5; // Prevent infinite recursion

    try {
      const results = await this.retrieveGives(
@@ -1127,11 +1137,24 @@ export default class HomeView extends Vue {
    } catch (e) {
      logger.error("[HomeView] ❌ Error in updateAllFeed:", e);
      this.handleFeedError(e);
+      // Don't retry on error
+      endOfResults = true;
    }

-    if (this.feedData.length === 0 && !endOfResults) {
-      logger.debug("[HomeView] 🔄 No results after filtering, retrying...");
-      await this.updateAllFeed();
+    // Fixed recursive retry with guard and retry count
+    if (
+      this.feedData.length === 0 &&
+      !endOfResults &&
+      retryCount < MAX_RETRIES
+    ) {
+      logger.debug("[HomeView] 🔄 No results after filtering, retrying...", {
+        retryCount: retryCount + 1,
+        maxRetries: MAX_RETRIES,
+      });
+      // Temporarily clear loading flag for recursive call
+      this.isFeedLoading = false;
+      await this.updateAllFeed(retryCount + 1);
+      return; // Exit after recursive call
    }

    this.isFeedLoading = false;
--- a/src/views/OnboardMeetingListView.vue
+++ b/src/views/OnboardMeetingListView.vue
@@ -77,7 +77,7 @@
        v-if="meetings.length === 0 && !isRegistered"
        class="text-center text-gray-500 py-8"
      >
-        No onboarding meetings are available
+        No onboarding meetings available
      </p>
    </div>

--- a/src/views/OnboardMeetingSetupView.vue
+++ b/src/views/OnboardMeetingSetupView.vue
@@ -473,7 +473,6 @@ export default class OnboardMeetingView extends Vue {
        );
        return;
      }
-      const password: string = this.newOrUpdatedMeetingInputs.password;

      // create content with user's name & DID encrypted with password
      const content = {
@@ -483,7 +482,7 @@ export default class OnboardMeetingView extends Vue {
      };
      const encryptedContent = await encryptMessage(
        JSON.stringify(content),
-        password,
+        this.newOrUpdatedMeetingInputs.password,
      );

      const headers = await getHeaders(this.activeDid);
@@ -506,11 +505,6 @@ export default class OnboardMeetingView extends Vue {

        this.newOrUpdatedMeetingInputs = null;
        this.notify.success(NOTIFY_MEETING_CREATED.message, TIMEOUTS.STANDARD);
-        // redirect to the same page with the password parameter set
-        this.$router.push({
-          name: "onboard-meeting-setup",
-          query: { password: password },
-        });
      } else {
        throw { response: response };
      }