Merge branch 'master' into meeting-members-admission-dialog

- Replace individual text props with single isOrganizer boolean prop
- Add computed properties for title, description, buttonText, and emptyStateText
- Simplify parent component interface by removing text prop passing
- Update quote style from single to double quotes for consistency
- Improve component encapsulation and maintainability

.cursor/rules/development/development_guide.mdc

@@ -2,7 +2,7 @@
 globs: **/src/**/*
 alwaysApply: false
 ---
-✅ use system date command to timestamp all interactions with accurate date and
+✅ use system date command to timestamp all documentation with accurate date and
   time
 ✅ remove whitespace at the end of lines
 ✅ use npm run lint-fix to check for warnings

.husky/pre-commit

@@ -9,6 +9,10 @@ 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."
@@ -18,6 +22,36 @@ 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..."

src/assets/styles/tailwind.css

@@ -38,7 +38,7 @@
 	}
 
 	.dialog {
-		@apply bg-white p-4 rounded-lg w-full max-w-lg;
+		@apply bg-white px-4 py-6 rounded-lg w-full max-w-lg max-h-[90%] overflow-y-auto;
 	}
 
 	/* Markdown content styling to restore list elements */

src/components/BulkMembersDialog.vue

@@ -0,0 +1,459 @@
+<template>
+  <div v-if="visible" class="dialog-overlay">
+    <div class="dialog">
+      <div class="text-slate-900 text-center">
+        <h3 class="text-lg font-semibold leading-[1.25] mb-2">
+          {{ title }}
+        </h3>
+        <p class="text-sm mb-4">
+          {{ description }}
+        </p>
+
+        <!-- Member Selection Table -->
+        <div 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">
+                  <label class="flex items-center gap-2">
+                    <input
+                      type="checkbox"
+                      :checked="isAllSelected"
+                      :indeterminate="isIndeterminate"
+                      @change="toggleSelectAll"
+                    />
+                    Select All
+                  </label>
+                </th>
+              </tr>
+            </thead>
+            <tbody>
+              <!-- Empty State -->
+              <tr v-if="!membersData || membersData.length === 0">
+                <td
+                  class="border border-slate-300 px-3 py-2 text-center italic text-gray-500"
+                >
+                  {{ emptyStateText }}
+                </td>
+              </tr>
+              <!-- Member Rows -->
+              <tr
+                v-for="member in membersData || []"
+                :key="member.member.memberId"
+              >
+                <td class="border border-slate-300 px-3 py-2">
+                  <div class="flex items-center justify-between gap-2">
+                    <label class="flex items-center gap-2">
+                      <input
+                        type="checkbox"
+                        :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>
+                    </label>
+
+                    <!-- Contact indicator - only show if they are already a contact -->
+                    <font-awesome
+                      v-if="member.isContact"
+                      icon="user-circle"
+                      class="fa-fw ms-auto text-slate-400 cursor-pointer hover:text-slate-600"
+                      @click="showContactInfo"
+                    />
+                  </div>
+                </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"
+            :class="[
+              'block w-full text-center text-md font-bold uppercase px-2 py-2 rounded-md',
+              hasSelectedMembers
+                ? 'bg-blue-600 text-white cursor-pointer'
+                : 'bg-slate-400 text-slate-200 cursor-not-allowed',
+            ]"
+            @click="handleMainAction"
+          >
+            {{ buttonText }}
+          </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
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+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 } from "@/libs/endorserServer";
+import { createNotifyHelpers } from "@/utils/notify";
+
+@Component({
+  mixins: [PlatformServiceMixin],
+  emits: ["close"],
+})
+export default class BulkMembersDialog extends Vue {
+  @Prop({ default: "" }) activeDid!: string;
+  @Prop({ default: "" }) apiServer!: string;
+  @Prop({ required: true }) dialogType!: "admit" | "visibility";
+  @Prop({ required: true }) isOrganizer!: boolean;
+
+  // Vue notification system
+  $notify!: (
+    notification: { group: string; type: string; title: string; text: string },
+    timeout?: number,
+  ) => void;
+
+  // Notification system
+  notify!: ReturnType<typeof createNotifyHelpers>;
+
+  // Component state
+  membersData: MemberData[] = [];
+  selectedMembers: string[] = [];
+  visible = false;
+
+  // Constants
+  // In Vue templates, imported constants need to be explicitly made available to the template
+  readonly SOMEONE_UNNAMED = SOMEONE_UNNAMED;
+
+  get hasSelectedMembers() {
+    return this.selectedMembers.length > 0;
+  }
+
+  get isAllSelected() {
+    if (!this.membersData || this.membersData.length === 0) return false;
+    return this.membersData.every((member) =>
+      this.selectedMembers.includes(member.did),
+    );
+  }
+
+  get isIndeterminate() {
+    if (!this.membersData || this.membersData.length === 0) return false;
+    const selectedCount = this.membersData.filter((member) =>
+      this.selectedMembers.includes(member.did),
+    ).length;
+    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";
+  }
+
+  created() {
+    this.notify = createNotifyHelpers(this.$notify);
+  }
+
+  open(members: MemberData[]) {
+    this.visible = true;
+    this.membersData = members;
+    // 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));
+  }
+
+  toggleSelectAll() {
+    if (!this.membersData || this.membersData.length === 0) return;
+
+    if (this.isAllSelected) {
+      // Deselect all
+      this.selectedMembers = [];
+    } else {
+      // Select all
+      this.selectedMembers = this.membersData.map((member) => member.did);
+    }
+  }
+
+  toggleMemberSelection(memberDid: string) {
+    const index = this.selectedMembers.indexOf(memberDid);
+    if (index > -1) {
+      this.selectedMembers.splice(index, 1);
+    } else {
+      this.selectedMembers.push(memberDid);
+    }
+  }
+
+  isMemberSelected(memberDid: string) {
+    return this.selectedMembers.includes(memberDid);
+  }
+
+  async handleMainAction() {
+    if (this.dialogType === "admit") {
+      await this.admitWithVisibility();
+    } else {
+      await this.addContactWithVisibility();
+    }
+  }
+
+  async admitWithVisibility() {
+    try {
+      const selectedMembers = this.membersData.filter((member) =>
+        this.selectedMembers.includes(member.did),
+      );
+      const notSelectedMembers = this.membersData.filter(
+        (member) => !this.selectedMembers.includes(member.did),
+      );
+
+      let admittedCount = 0;
+      let contactAddedCount = 0;
+
+      for (const member of selectedMembers) {
+        try {
+          // First, admit the member
+          await this.admitMember(member);
+          admittedCount++;
+
+          // If they're not a contact yet, add them as a contact
+          if (!member.isContact) {
+            await this.addAsContact(member);
+            contactAddedCount++;
+          }
+
+          // Set their seesMe to true
+          await this.updateContactVisibility(member.did, true);
+        } catch (error) {
+          // eslint-disable-next-line no-console
+          console.error(`Error processing member ${member.did}:`, error);
+          // Continue with other members even if one fails
+        }
+      }
+
+      // Show success notification
+      this.$notify(
+        {
+          group: "alert",
+          type: "success",
+          title: "Members Admitted Successfully",
+          text: `${admittedCount} member${admittedCount === 1 ? "" : "s"} admitted${contactAddedCount === 0 ? "" : admittedCount === contactAddedCount ? " and" : `, ${contactAddedCount}`}${contactAddedCount === 0 ? "" : ` added as contact${contactAddedCount === 1 ? "" : "s"}`}.`,
+        },
+        10000,
+      );
+
+      this.close(notSelectedMembers.map((member) => member.did));
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.error("Error admitting members:", error);
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "Failed to admit some members. Please try again.",
+        },
+        5000,
+      );
+    }
+  }
+
+  async addContactWithVisibility() {
+    try {
+      const selectedMembers = this.membersData.filter((member) =>
+        this.selectedMembers.includes(member.did),
+      );
+      const notSelectedMembers = this.membersData.filter(
+        (member) => !this.selectedMembers.includes(member.did),
+      );
+
+      let contactsAddedCount = 0;
+
+      for (const member of selectedMembers) {
+        try {
+          // If they're not a contact yet, add them as a contact first
+          if (!member.isContact) {
+            await this.addAsContact(member);
+            contactsAddedCount++;
+          }
+
+          // Set their seesMe to true
+          await this.updateContactVisibility(member.did, true);
+        } catch (error) {
+          // eslint-disable-next-line no-console
+          console.error(`Error processing member ${member.did}:`, error);
+          // Continue with other members even if one fails
+        }
+      }
+
+      // Show success notification
+      this.$notify(
+        {
+          group: "alert",
+          type: "success",
+          title: "Contacts Added Successfully",
+          text: `${contactsAddedCount} member${contactsAddedCount === 1 ? "" : "s"} added as contact${contactsAddedCount === 1 ? "" : "s"}.`,
+        },
+        5000,
+      );
+
+      this.close(notSelectedMembers.map((member) => member.did));
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.error("Error adding contacts:", error);
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "Failed to add some members as contacts. Please try again.",
+        },
+        5000,
+      );
+    }
+  }
+
+  async admitMember(member: {
+    did: string;
+    name: string;
+    member: { memberId: 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 addAsContact(member: { did: string; name: string }) {
+    try {
+      const newContact = {
+        did: member.did,
+        name: member.name,
+      };
+
+      await this.$insertContact(newContact);
+    } catch (err) {
+      // eslint-disable-next-line no-console
+      console.error("Error adding contact:", err);
+      if (err instanceof Error && err.message?.indexOf("already exists") > -1) {
+        // Contact already exists, continue
+      } else {
+        throw err; // Re-throw if it's not a duplicate error
+      }
+    }
+  }
+
+  async updateContactVisibility(did: string, seesMe: boolean) {
+    try {
+      // Get the contact object
+      const contact = await this.$getContact(did);
+      if (!contact) {
+        throw new Error(`Contact not found for DID: ${did}`);
+      }
+
+      // Use the proper API to set visibility on the server
+      const result = await setVisibilityUtil(
+        this.activeDid,
+        this.apiServer,
+        this.axios,
+        contact,
+        seesMe,
+      );
+
+      if (!result.success) {
+        throw new Error(result.error || "Failed to set visibility");
+      }
+    } catch (err) {
+      // eslint-disable-next-line no-console
+      console.error("Error updating contact visibility:", err);
+      throw err;
+    }
+  }
+
+  showContactInfo() {
+    const message =
+      this.dialogType === "admit"
+        ? "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,
+      },
+      5000,
+    );
+  }
+}
+</script>

src/components/FeedFilters.vue

@@ -211,8 +211,6 @@ export default class FeedFilters extends Vue {
 }
 </script>
 
-<style>
-#dialogFeedFilters.dialog-overlay {
-  overflow: scroll;
-}
+<style scoped>
+/* Component-specific styles if needed */
 </style>

src/components/MembersList.vue

@@ -1,183 +1,235 @@
 <template>
-  <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 py-4">
-        {{ decryptionErrorMessage() }}
+  <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>
 
-      <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>
+      <!-- Members List -->
 
-      <div>
-        <span
-          v-if="membersToShow().length > 0 && showOrganizerTools && isOrganizer"
-          class="inline-flex items-center flex-wrap"
-        >
-          <span class="inline-flex items-center">
-            &bull; Click
-            <span
-              class="mx-2 min-w-[24px] min-h-[24px] w-6 h-6 flex items-center justify-center rounded-full bg-blue-100 text-blue-600"
-            >
-              <font-awesome icon="plus" class="text-sm" />
-            </span>
-            /
-            <span
-              class="mx-2 min-w-[24px] min-h-[24px] w-6 h-6 flex items-center justify-center rounded-full bg-blue-100 text-blue-600"
-            >
-              <font-awesome icon="minus" class="text-sm" />
-            </span>
-            to add/remove them to/from the meeting.
-          </span>
-        </span>
-      </div>
-      <div>
-        <span
-          v-if="membersToShow().length > 0"
-          class="inline-flex items-center"
-        >
-          &bull; Click
-          <span
-            class="mx-2 w-8 h-8 flex items-center justify-center rounded-full bg-green-100 text-green-600"
+      <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
+            "
           >
-            <font-awesome icon="circle-user" class="text-xl" />
-          </span>
-          to add them to your contacts.
-        </span>
-      </div>
+            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-center">
-        <!-- 
+        <div class="flex justify-between">
+          <!-- 
         always have at least one refresh button even without members in case the organizer 
          changes the password 
          -->
-        <button
-          class="btn-action-refresh"
-          title="Refresh members list"
-          @click="fetchMembers"
-        >
-          <font-awesome icon="rotate" :class="{ 'fa-spin': isLoading }" />
-        </button>
-      </div>
-      <div
-        v-for="member in membersToShow()"
-        :key="member.member.memberId"
-        class="mt-2 p-4 bg-gray-50 rounded-lg"
-      >
-        <div class="flex items-center justify-between">
-          <div class="flex items-center">
-            <h3 class="text-lg font-medium">
-              {{ member.name || unnamedMember }}
-            </h3>
-            <div
-              v-if="!getContactFor(member.did) && member.did !== activeDid"
-              class="flex justify-end"
-            >
-              <button
-                class="btn-add-contact"
-                title="Add as contact"
-                @click="addAsContact(member)"
-              >
-                <font-awesome icon="circle-user" class="text-xl" />
-              </button>
-            </div>
-            <button
-              v-if="member.did !== activeDid"
-              class="btn-info-contact"
-              title="Contact info"
-              @click="
-                informAboutAddingContact(
-                  getContactFor(member.did) !== undefined,
-                )
-              "
-            >
-              <font-awesome icon="circle-info" class="text-base" />
-            </button>
-          </div>
-          <div class="flex">
-            <span
-              v-if="
-                showOrganizerTools && isOrganizer && member.did !== activeDid
-              "
-              class="flex items-center"
-            >
-              <button
-                class="btn-admission"
-                :title="
-                  member.member.admitted ? 'Remove member' : 'Admit member'
-                "
-                @click="checkWhetherContactBeforeAdmitting(member)"
-              >
-                <font-awesome
-                  :icon="member.member.admitted ? 'minus' : 'plus'"
-                  class="text-sm"
-                />
-              </button>
-              <button
-                class="btn-info-admission"
-                title="Admission info"
-                @click="informAboutAdmission()"
-              >
-                <font-awesome icon="circle-info" class="text-base" />
-              </button>
-            </span>
-          </div>
+          <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 class="text-sm text-gray-600 truncate">
-          {{ member.did }}
+        <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-blue-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 ms-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" />
+                  </button>
+                </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 v-if="membersToShow().length > 0" class="flex justify-center mt-4">
-        <button
-          class="btn-action-refresh"
-          title="Refresh members list"
-          @click="fetchMembers"
-        >
-          <font-awesome icon="rotate" :class="{ 'fa-spin': isLoading }" />
-        </button>
-      </div>
-
-      <p v-if="members.length === 0" class="text-gray-500 py-4">
-        No members have joined this meeting yet
-      </p>
     </div>
+
+    <!-- Bulk Members Dialog for both admitting and setting visibility -->
+    <BulkMembersDialog
+      ref="bulkMembersDialog"
+      :active-did="activeDid"
+      :api-server="apiServer"
+      :dialog-type="isOrganizer ? 'admit' : 'visibility'"
+      :is-organizer="isOrganizer"
+      @close="closeBulkMembersDialogCallback"
+    />
   </div>
 </template>
 
 <script lang="ts">
 import { Component, Vue, Prop, Emit } from "vue-facing-decorator";
 
-import {
-  errorStringForLog,
-  getHeaders,
-  register,
-  serverMessageForUser,
-} 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 { 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";
+import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
+import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
+import BulkMembersDialog from "./BulkMembersDialog.vue";
 
 interface Member {
   admitted: boolean;
@@ -193,13 +245,15 @@ interface DecryptedMember {
 }
 
 @Component({
+  components: {
+    BulkMembersDialog,
+  },
   mixins: [PlatformServiceMixin],
 })
 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;
@@ -210,6 +264,7 @@ export default class MembersList extends Vue {
     return message;
   }
 
+  contacts: Array<Contact> = [];
   decryptedMembers: DecryptedMember[] = [];
   firstName = "";
   isLoading = true;
@@ -219,7 +274,12 @@ export default class MembersList extends Vue {
   missingMyself = false;
   activeDid = "";
   apiServer = "";
-  contacts: Array<Contact> = [];
+
+  // Auto-refresh functionality
+  countdownTimer = 10;
+  autoRefreshInterval: NodeJS.Timeout | null = null;
+  lastRefreshTime = 0;
+  previousMemberDidsIgnored: string[] = [];
 
   /**
    * Get the unnamed member constant
@@ -240,8 +300,8 @@ export default class MembersList extends Vue {
 
     this.apiServer = settings.apiServer || "";
     this.firstName = settings.firstName || "";
-    await this.fetchMembers();
-    await this.loadContacts();
+
+    this.refreshData();
   }
 
   async fetchMembers() {
@@ -287,7 +347,10 @@ export default class MembersList extends Vue {
         const content = JSON.parse(decryptedContent);
 
         this.decryptedMembers.push({
-          member: member,
+          member: {
+            ...member,
+            admitted: member.admitted !== undefined ? member.admitted : true, // Default to true for non-organizers
+          },
           name: content.name,
           did: content.did,
           isRegistered: !!content.isRegistered,
@@ -329,22 +392,81 @@ export default class MembersList extends Vue {
   }
 
   membersToShow(): DecryptedMember[] {
+    let members: DecryptedMember[] = [];
+
     if (this.isOrganizer) {
       if (this.showOrganizerTools) {
-        return this.decryptedMembers;
+        members = this.decryptedMembers;
       } else {
-        return this.decryptedMembers.filter(
+        members = 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;
+      }
     }
-    // non-organizers only get visible members from server
-    return 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;
+    });
   }
 
   informAboutAdmission() {
     this.notify.info(
-      "This is to register people in Time Safari and to admit them to the meeting. A '+' symbol means they are not yet admitted and you can register and admit them. A '-' means you can remove them, but they will stay registered.",
+      "This is to register people in Time Safari and to admit them to the meeting. A (+) symbol means they are not yet admitted and you can register and admit them. A (-) symbol means you can remove them, but they will stay registered.",
       TIMEOUTS.VERY_LONG,
     );
   }
@@ -363,18 +485,85 @@ 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[] {
+    return this.decryptedMembers
+      .filter(
+        (member) => member.did !== this.activeDid && !member.member.admitted,
+      )
+      .map(this.convertDecryptedMemberToMemberData);
+  }
+
+  getNonContactMembers(): MemberData[] {
+    return this.decryptedMembers
+      .filter(
+        (member) =>
+          member.did !== this.activeDid && !this.getContactFor(member.did),
+      )
+      .map(this.convertDecryptedMemberToMemberData);
+  }
+
+  convertDecryptedMemberToMemberData(
+    decryptedMember: DecryptedMember,
+  ): MemberData {
+    return {
+      did: decryptedMember.did,
+      name: decryptedMember.name,
+      isContact: !!this.getContactFor(decryptedMember.did),
+      member: {
+        memberId: decryptedMember.member.memberId.toString(),
+      },
+    };
+  }
+
+  /**
+   * Show the bulk members dialog if conditions are met
+   * (admit pending members for organizers, add to contacts for non-organizers)
+   */
+  async refreshData(bypassPromptIfAllWereIgnored = true) {
+    // Force refresh both contacts and members
+    this.contacts = await this.$getAllContacts();
+    await this.fetchMembers();
+
+    const pendingMembers = this.isOrganizer
+      ? this.getPendingMembersToAdmit()
+      : this.getNonContactMembers();
+    if (pendingMembers.length === 0) {
+      this.startAutoRefresh();
+      return;
+    }
+    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;
+      }
+    }
+    this.stopAutoRefresh();
+    (this.$refs.bulkMembersDialog as BulkMembersDialog).open(pendingMembers);
+  }
+
+  // Bulk Members Dialog methods
+  async closeBulkMembersDialogCallback(
+    result: { notSelectedMemberDids: string[] } | undefined,
+  ) {
+    this.previousMemberDidsIgnored = result?.notSelectedMemberDids || [];
+
+    await this.refreshData();
+  }
+
   checkWhetherContactBeforeAdmitting(decrMember: DecryptedMember) {
     const contact = this.getContactFor(decrMember.did);
     if (!decrMember.member.admitted && !contact) {
-      // If not a contact, show confirmation dialog
+      // If not a contact, stop auto-refresh and show confirmation dialog
+      this.stopAutoRefresh();
       this.$notify(
         {
           group: "modal",
@@ -387,6 +576,7 @@ 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
@@ -399,14 +589,19 @@ 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,
       );
@@ -508,6 +703,41 @@ export default class MembersList extends Vue {
       this.notify.error(message, TIMEOUTS.LONG);
     }
   }
+
+  startAutoRefresh() {
+    this.stopAutoRefresh();
+    this.lastRefreshTime = Date.now();
+    this.countdownTimer = 10;
+
+    this.autoRefreshInterval = setInterval(() => {
+      const now = Date.now();
+      const timeSinceLastRefresh = (now - this.lastRefreshTime) / 1000;
+
+      if (timeSinceLastRefresh >= 10) {
+        // Time to refresh
+        this.refreshData();
+        this.lastRefreshTime = now;
+        this.countdownTimer = 10;
+      } else {
+        // Update countdown
+        this.countdownTimer = Math.max(
+          0,
+          Math.round(10 - timeSinceLastRefresh),
+        );
+      }
+    }, 1000); // Update every second
+  }
+
+  stopAutoRefresh() {
+    if (this.autoRefreshInterval) {
+      clearInterval(this.autoRefreshInterval);
+      this.autoRefreshInterval = null;
+    }
+  }
+
+  beforeDestroy() {
+    this.stopAutoRefresh();
+  }
 }
 </script>
 
@@ -522,29 +752,26 @@ export default class MembersList extends Vue {
 
 .btn-add-contact {
   /* stylelint-disable-next-line at-rule-no-unknown */
-  @apply ml-2 w-8 h-8 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 {
-  /* stylelint-disable-next-line at-rule-no-unknown */
-  @apply ml-2 mb-2 w-6 h-6 flex items-center justify-center rounded-full 
-    bg-slate-100 text-slate-500 hover:bg-slate-200 hover:text-slate-800 
-    transition-colors;
-}
-
-.btn-admission {
-  /* stylelint-disable-next-line at-rule-no-unknown */
-  @apply mr-2 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 
+  @apply text-lg text-green-600 hover:text-green-800 
     transition-colors;
 }
 
+.btn-info-contact,
 .btn-info-admission {
   /* stylelint-disable-next-line at-rule-no-unknown */
-  @apply mr-2 mb-2 w-6 h-6 flex items-center justify-center rounded-full 
-    bg-slate-100 text-slate-500 hover:bg-slate-200 hover:text-slate-800 
+  @apply text-slate-400 hover:text-slate-600 
+    transition-colors;
+}
+
+.btn-admission-add {
+  /* 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 
     transition-colors;
 }
 </style>

src/constants/app.ts

@@ -59,7 +59,7 @@ export const PASSKEYS_ENABLED =
 export interface NotificationIface {
   group: string; // "alert" | "modal"
   type: string; // "toast" | "info" | "success" | "warning" | "danger"
-  title: string;
+  title?: string;
   text?: string;
   callback?: (success: boolean) => Promise<void>; // if this triggered an action
   noText?: string;
@@ -68,4 +68,11 @@ export interface NotificationIface {
   onYes?: () => Promise<void>;
   promptToStopAsking?: boolean;
   yesText?: string;
+  membersData?: Array<{
+    member: { admitted: boolean; content: string; memberId: number };
+    name: string;
+    did: string;
+    isContact: boolean;
+    contact?: { did: string; name?: string; seesMe?: boolean };
+  }>; // For passing member data to visibility dialog
 }

src/interfaces/user.ts

@@ -6,3 +6,12 @@ export interface UserInfo {
   profileImageUrl?: string;
   nextPublicEncKeyHash?: string;
 }
+
+export interface MemberData {
+  did: string;
+  name: string;
+  isContact: boolean;
+  member: {
+    memberId: string;
+  };
+}

src/libs/endorserServer.ts

@@ -702,7 +702,7 @@ export function serverMessageForUser(error: unknown): string | undefined {
 export function errorStringForLog(error: unknown) {
   let stringifiedError = "" + error;
   try {
-    stringifiedError = JSON.stringify(error);
+    stringifiedError = safeStringify(error);
   } catch (e) {
     // can happen with Dexie, eg:
     // TypeError: Converting circular structure to JSON
@@ -714,7 +714,7 @@ export function errorStringForLog(error: unknown) {
 
   if (error && typeof error === "object" && "response" in error) {
     const err = error as AxiosErrorResponse;
-    const errorResponseText = JSON.stringify(err.response);
+    const errorResponseText = safeStringify(err.response);
     // for some reason, error.response is not included in stringify result (eg. for 400 errors on invite redemptions)
     if (!R.empty(errorResponseText) && !fullError.includes(errorResponseText)) {
       // add error.response stuff
@@ -724,7 +724,7 @@ export function errorStringForLog(error: unknown) {
         R.equals(err.config, err.response.config)
       ) {
         // but exclude "config" because it's already in there
-        const newErrorResponseText = JSON.stringify(
+        const newErrorResponseText = safeStringify(
           R.omit(["config"] as never[], err.response),
         );
         fullError +=

src/libs/fontawesome.ts

@@ -29,6 +29,7 @@ import {
   faCircle,
   faCircleCheck,
   faCircleInfo,
+  faCircleMinus,
   faCirclePlus,
   faCircleQuestion,
   faCircleRight,
@@ -37,6 +38,7 @@ import {
   faCoins,
   faComment,
   faCopy,
+  faCrown,
   faDollar,
   faDownload,
   faEllipsis,
@@ -58,6 +60,7 @@ import {
   faHand,
   faHandHoldingDollar,
   faHandHoldingHeart,
+  faHourglassHalf,
   faHouseChimney,
   faImage,
   faImagePortrait,
@@ -123,6 +126,7 @@ library.add(
   faCircle,
   faCircleCheck,
   faCircleInfo,
+  faCircleMinus,
   faCirclePlus,
   faCircleQuestion,
   faCircleRight,
@@ -131,6 +135,7 @@ library.add(
   faCoins,
   faComment,
   faCopy,
+  faCrown,
   faDollar,
   faDownload,
   faEllipsis,
@@ -152,6 +157,7 @@ library.add(
   faHand,
   faHandHoldingDollar,
   faHandHoldingHeart,
+  faHourglassHalf,
   faHouseChimney,
   faImage,
   faImagePortrait,

src/libs/util.ts

@@ -988,11 +988,6 @@ export async function importFromMnemonic(
 ): Promise<void> {
   const mne: string = mnemonic.trim().toLowerCase();
 
-  // Check if this is Test User #0
-  const TEST_USER_0_MNEMONIC =
-    "rigid shrug mobile smart veteran half all pond toilet brave review universe ship congress found yard skate elite apology jar uniform subway slender luggage";
-  const isTestUser0 = mne === TEST_USER_0_MNEMONIC;
-
   // Derive address and keys from mnemonic
   const [address, privateHex, publicHex] = deriveAddress(mne, derivationPath);
 
@@ -1007,90 +1002,6 @@ export async function importFromMnemonic(
 
   // Save the new identity
   await saveNewIdentity(newId, mne, derivationPath);
-
-  // Set up Test User #0 specific settings
-  if (isTestUser0) {
-    // Set up Test User #0 specific settings with enhanced error handling
-    const platformService = await getPlatformService();
-
-    try {
-      // First, ensure the DID-specific settings record exists
-      await platformService.insertNewDidIntoSettings(newId.did);
-
-      // Then update with Test User #0 specific settings
-      await platformService.updateDidSpecificSettings(newId.did, {
-        firstName: "User Zero",
-        isRegistered: true,
-      });
-
-      // Verify the settings were saved correctly
-      const verificationResult = await platformService.dbQuery(
-        "SELECT firstName, isRegistered FROM settings WHERE accountDid = ?",
-        [newId.did],
-      );
-
-      if (verificationResult?.values?.length) {
-        const settings = verificationResult.values[0];
-        const firstName = settings[0];
-        const isRegistered = settings[1];
-
-        logger.debug(
-          "[importFromMnemonic] Test User #0 settings verification",
-          {
-            did: newId.did,
-            firstName,
-            isRegistered,
-            expectedFirstName: "User Zero",
-            expectedIsRegistered: true,
-          },
-        );
-
-        // If settings weren't saved correctly, try individual updates
-        if (firstName !== "User Zero" || isRegistered !== 1) {
-          logger.warn(
-            "[importFromMnemonic] Test User #0 settings not saved correctly, retrying with individual updates",
-          );
-
-          await platformService.dbExec(
-            "UPDATE settings SET firstName = ? WHERE accountDid = ?",
-            ["User Zero", newId.did],
-          );
-
-          await platformService.dbExec(
-            "UPDATE settings SET isRegistered = ? WHERE accountDid = ?",
-            [1, newId.did],
-          );
-
-          // Verify again
-          const retryResult = await platformService.dbQuery(
-            "SELECT firstName, isRegistered FROM settings WHERE accountDid = ?",
-            [newId.did],
-          );
-
-          if (retryResult?.values?.length) {
-            const retrySettings = retryResult.values[0];
-            logger.debug(
-              "[importFromMnemonic] Test User #0 settings after retry",
-              {
-                firstName: retrySettings[0],
-                isRegistered: retrySettings[1],
-              },
-            );
-          }
-        }
-      } else {
-        logger.error(
-          "[importFromMnemonic] Failed to verify Test User #0 settings - no record found",
-        );
-      }
-    } catch (error) {
-      logger.error(
-        "[importFromMnemonic] Error setting up Test User #0 settings:",
-        error,
-      );
-      // Don't throw - allow the import to continue even if settings fail
-    }
-  }
 }
 
 /**

src/services/platforms/BaseDatabaseService.ts

@@ -0,0 +1,297 @@
+/**
+ * @fileoverview Base Database Service for Platform Services
+ * @author Matthew Raymer
+ *
+ * This abstract base class provides common database operations that are
+ * identical across all platform implementations. It eliminates code
+ * duplication and ensures consistency in database operations.
+ *
+ * Key Features:
+ * - Common database utility methods
+ * - Consistent settings management
+ * - Active identity management
+ * - Abstract methods for platform-specific database operations
+ *
+ * Architecture:
+ * - Abstract base class with common implementations
+ * - Platform services extend this class
+ * - Platform-specific database operations remain abstract
+ *
+ * @since 1.1.1-beta
+ */
+
+import { logger } from "../../utils/logger";
+import { QueryExecResult } from "@/interfaces/database";
+
+/**
+ * Abstract base class for platform-specific database services.
+ *
+ * This class provides common database operations that are identical
+ * across all platform implementations (Web, Capacitor, Electron).
+ * Platform-specific services extend this class and implement the
+ * abstract database operation methods.
+ *
+ * Common Operations:
+ * - Settings management (update, retrieve, insert)
+ * - Active identity management
+ * - Database utility methods
+ *
+ * @abstract
+ * @example
+ * ```typescript
+ * export class WebPlatformService extends BaseDatabaseService {
+ *   async dbQuery(sql: string, params?: unknown[]): Promise<QueryExecResult> {
+ *     // Web-specific implementation
+ *   }
+ * }
+ * ```
+ */
+export abstract class BaseDatabaseService {
+  /**
+   * Generate an INSERT statement for a model object.
+   *
+   * Creates a parameterized INSERT statement with placeholders for
+   * all properties in the model object. This ensures safe SQL
+   * execution and prevents SQL injection.
+   *
+   * @param model - Object containing the data to insert
+   * @param tableName - Name of the target table
+   * @returns Object containing the SQL statement and parameters
+   *
+   * @example
+   * ```typescript
+   * const { sql, params } = this.generateInsertStatement(
+   *   { name: 'John', age: 30 },
+   *   'users'
+   * );
+   * // sql: "INSERT INTO users (name, age) VALUES (?, ?)"
+   * // params: ['John', 30]
+   * ```
+   */
+  generateInsertStatement(
+    model: Record<string, unknown>,
+    tableName: string,
+  ): { sql: string; params: unknown[] } {
+    const keys = Object.keys(model);
+    const placeholders = keys.map(() => "?").join(", ");
+    const sql = `INSERT INTO ${tableName} (${keys.join(", ")}) VALUES (${placeholders})`;
+    const params = keys.map((key) => model[key]);
+    return { sql, params };
+  }
+
+  /**
+   * Update default settings for the currently active account.
+   *
+   * Retrieves the active DID from the active_identity table and updates
+   * the corresponding settings record. This ensures settings are always
+   * updated for the correct account.
+   *
+   * @param settings - Object containing the settings to update
+   * @returns Promise that resolves when settings are updated
+   *
+   * @throws {Error} If no active DID is found or database operation fails
+   *
+   * @example
+   * ```typescript
+   * await this.updateDefaultSettings({
+   *   theme: 'dark',
+   *   notifications: true
+   * });
+   * ```
+   */
+  async updateDefaultSettings(
+    settings: Record<string, unknown>,
+  ): Promise<void> {
+    // Get current active DID and update that identity's settings
+    const activeIdentity = await this.getActiveIdentity();
+    const activeDid = activeIdentity.activeDid;
+
+    if (!activeDid) {
+      logger.warn(
+        "[BaseDatabaseService] No active DID found, cannot update default settings",
+      );
+      return;
+    }
+
+    const keys = Object.keys(settings);
+    const setClause = keys.map((key) => `${key} = ?`).join(", ");
+    const sql = `UPDATE settings SET ${setClause} WHERE accountDid = ?`;
+    const params = [...keys.map((key) => settings[key]), activeDid];
+    await this.dbExec(sql, params);
+  }
+
+  /**
+   * Update the active DID in the active_identity table.
+   *
+   * Sets the active DID and updates the lastUpdated timestamp.
+   * This is used when switching between different accounts/identities.
+   *
+   * @param did - The DID to set as active
+   * @returns Promise that resolves when the update is complete
+   *
+   * @example
+   * ```typescript
+   * await this.updateActiveDid('did:example:123');
+   * ```
+   */
+  async updateActiveDid(did: string): Promise<void> {
+    await this.dbExec(
+      "UPDATE active_identity SET activeDid = ?, lastUpdated = datetime('now') WHERE id = 1",
+      [did],
+    );
+  }
+
+  /**
+   * Get the currently active DID from the active_identity table.
+   *
+   * Retrieves the active DID that represents the currently selected
+   * account/identity. This is used throughout the application to
+   * ensure operations are performed on the correct account.
+   *
+   * @returns Promise resolving to object containing the active DID
+   *
+   * @example
+   * ```typescript
+   * const { activeDid } = await this.getActiveIdentity();
+   * console.log('Current active DID:', activeDid);
+   * ```
+   */
+  async getActiveIdentity(): Promise<{ activeDid: string }> {
+    const result = (await this.dbQuery(
+      "SELECT activeDid FROM active_identity WHERE id = 1",
+    )) as QueryExecResult;
+    return {
+      activeDid: (result?.values?.[0]?.[0] as string) || "",
+    };
+  }
+
+  /**
+   * Insert a new DID into the settings table with default values.
+   *
+   * Creates a new settings record for a DID with default configuration
+   * values. Uses INSERT OR REPLACE to handle cases where settings
+   * already exist for the DID.
+   *
+   * @param did - The DID to create settings for
+   * @returns Promise that resolves when settings are created
+   *
+   * @example
+   * ```typescript
+   * await this.insertNewDidIntoSettings('did:example:123');
+   * ```
+   */
+  async insertNewDidIntoSettings(did: string): Promise<void> {
+    // Import constants dynamically to avoid circular dependencies
+    const { DEFAULT_ENDORSER_API_SERVER, DEFAULT_PARTNER_API_SERVER } =
+      await import("@/constants/app");
+
+    // Use INSERT OR REPLACE to handle case where settings already exist for this DID
+    // This prevents duplicate accountDid entries and ensures data integrity
+    await this.dbExec(
+      "INSERT OR REPLACE INTO settings (accountDid, finishedOnboarding, apiServer, partnerApiServer) VALUES (?, ?, ?, ?)",
+      [did, false, DEFAULT_ENDORSER_API_SERVER, DEFAULT_PARTNER_API_SERVER],
+    );
+  }
+
+  /**
+   * Update settings for a specific DID.
+   *
+   * Updates settings for a particular DID rather than the active one.
+   * This is useful for bulk operations or when managing multiple accounts.
+   *
+   * @param did - The DID to update settings for
+   * @param settings - Object containing the settings to update
+   * @returns Promise that resolves when settings are updated
+   *
+   * @example
+   * ```typescript
+   * await this.updateDidSpecificSettings('did:example:123', {
+   *   theme: 'light',
+   *   notifications: false
+   * });
+   * ```
+   */
+  async updateDidSpecificSettings(
+    did: string,
+    settings: Record<string, unknown>,
+  ): Promise<void> {
+    const keys = Object.keys(settings);
+    const setClause = keys.map((key) => `${key} = ?`).join(", ");
+    const sql = `UPDATE settings SET ${setClause} WHERE accountDid = ?`;
+    const params = [...keys.map((key) => settings[key]), did];
+    await this.dbExec(sql, params);
+  }
+
+  /**
+   * Retrieve settings for the currently active account.
+   *
+   * Gets the active DID and retrieves all settings for that account.
+   * Excludes the 'id' column from the returned settings object.
+   *
+   * @returns Promise resolving to settings object or null if no active DID
+   *
+   * @example
+   * ```typescript
+   * const settings = await this.retrieveSettingsForActiveAccount();
+   * if (settings) {
+   *   console.log('Theme:', settings.theme);
+   *   console.log('Notifications:', settings.notifications);
+   * }
+   * ```
+   */
+  async retrieveSettingsForActiveAccount(): Promise<Record<
+    string,
+    unknown
+  > | null> {
+    // Get current active DID from active_identity table
+    const activeIdentity = await this.getActiveIdentity();
+    const activeDid = activeIdentity.activeDid;
+
+    if (!activeDid) {
+      return null;
+    }
+
+    const result = (await this.dbQuery(
+      "SELECT * FROM settings WHERE accountDid = ?",
+      [activeDid],
+    )) as QueryExecResult;
+    if (result?.values?.[0]) {
+      // Convert the row to an object
+      const row = result.values[0];
+      const columns = result.columns || [];
+      const settings: Record<string, unknown> = {};
+
+      columns.forEach((column: string, index: number) => {
+        if (column !== "id") {
+          // Exclude the id column
+          settings[column] = row[index];
+        }
+      });
+
+      return settings;
+    }
+    return null;
+  }
+
+  // Abstract methods that must be implemented by platform-specific services
+
+  /**
+   * Execute a database query (SELECT operations).
+   *
+   * @abstract
+   * @param sql - SQL query string
+   * @param params - Optional parameters for prepared statements
+   * @returns Promise resolving to query results
+   */
+  abstract dbQuery(sql: string, params?: unknown[]): Promise<unknown>;
+
+  /**
+   * Execute a database statement (INSERT, UPDATE, DELETE operations).
+   *
+   * @abstract
+   * @param sql - SQL statement string
+   * @param params - Optional parameters for prepared statements
+   * @returns Promise resolving to execution results
+   */
+  abstract dbExec(sql: string, params?: unknown[]): Promise<unknown>;
+}

src/services/platforms/CapacitorPlatformService.ts

@@ -22,6 +22,7 @@ import {
   PlatformCapabilities,
 } from "../PlatformService";
 import { logger } from "../../utils/logger";
+import { BaseDatabaseService } from "./BaseDatabaseService";
 
 interface QueuedOperation {
   type: "run" | "query" | "rawQuery";
@@ -39,7 +40,10 @@ interface QueuedOperation {
  * - Platform-specific features
  * - SQLite database operations
  */
-export class CapacitorPlatformService implements PlatformService {
+export class CapacitorPlatformService
+  extends BaseDatabaseService
+  implements PlatformService
+{
   /** Current camera direction */
   private currentDirection: CameraDirection = CameraDirection.Rear;
 
@@ -52,6 +56,7 @@ export class CapacitorPlatformService implements PlatformService {
   private isProcessingQueue: boolean = false;
 
   constructor() {
+    super();
     this.sqlite = new SQLiteConnection(CapacitorSQLite);
   }
 
@@ -1328,79 +1333,8 @@ export class CapacitorPlatformService implements PlatformService {
   // --- PWA/Web-only methods (no-op for Capacitor) ---
   public registerServiceWorker(): void {}
 
-  // Database utility methods
-  generateInsertStatement(
-    model: Record<string, unknown>,
-    tableName: string,
-  ): { sql: string; params: unknown[] } {
-    const keys = Object.keys(model);
-    const placeholders = keys.map(() => "?").join(", ");
-    const sql = `INSERT INTO ${tableName} (${keys.join(", ")}) VALUES (${placeholders})`;
-    const params = keys.map((key) => model[key]);
-    return { sql, params };
-  }
-
-  async updateDefaultSettings(
-    settings: Record<string, unknown>,
-  ): Promise<void> {
-    const keys = Object.keys(settings);
-    const setClause = keys.map((key) => `${key} = ?`).join(", ");
-    const sql = `UPDATE settings SET ${setClause} WHERE id = 1`;
-    const params = keys.map((key) => settings[key]);
-    await this.dbExec(sql, params);
-  }
-
-  async updateActiveDid(did: string): Promise<void> {
-    await this.dbExec(
-      "UPDATE active_identity SET activeDid = ?, lastUpdated = datetime('now') WHERE id = 1",
-      [did],
-    );
-  }
-
-  async insertNewDidIntoSettings(did: string): Promise<void> {
-    // Import constants dynamically to avoid circular dependencies
-    const { DEFAULT_ENDORSER_API_SERVER, DEFAULT_PARTNER_API_SERVER } =
-      await import("@/constants/app");
-
-    // Use INSERT OR REPLACE to handle case where settings already exist for this DID
-    // This prevents duplicate accountDid entries and ensures data integrity
-    await this.dbExec(
-      "INSERT OR REPLACE INTO settings (accountDid, finishedOnboarding, apiServer, partnerApiServer) VALUES (?, ?, ?, ?)",
-      [did, false, DEFAULT_ENDORSER_API_SERVER, DEFAULT_PARTNER_API_SERVER],
-    );
-  }
-
-  async updateDidSpecificSettings(
-    did: string,
-    settings: Record<string, unknown>,
-  ): Promise<void> {
-    const keys = Object.keys(settings);
-    const setClause = keys.map((key) => `${key} = ?`).join(", ");
-    const sql = `UPDATE settings SET ${setClause} WHERE accountDid = ?`;
-    const params = [...keys.map((key) => settings[key]), did];
-    await this.dbExec(sql, params);
-  }
-
-  async retrieveSettingsForActiveAccount(): Promise<Record<
-    string,
-    unknown
-  > | null> {
-    const result = await this.dbQuery("SELECT * FROM settings WHERE id = 1");
-    if (result?.values?.[0]) {
-      // Convert the row to an object
-      const row = result.values[0];
-      const columns = result.columns || [];
-      const settings: Record<string, unknown> = {};
-
-      columns.forEach((column, index) => {
-        if (column !== "id") {
-          // Exclude the id column
-          settings[column] = row[index];
-        }
-      });
-
-      return settings;
-    }
-    return null;
-  }
+  // Database utility methods - inherited from BaseDatabaseService
+  // generateInsertStatement, updateDefaultSettings, updateActiveDid,
+  // getActiveIdentity, insertNewDidIntoSettings, updateDidSpecificSettings,
+  // retrieveSettingsForActiveAccount are all inherited from BaseDatabaseService
 }

src/services/platforms/WebPlatformService.ts

@@ -5,6 +5,7 @@ import {
 } from "../PlatformService";
 import { logger } from "../../utils/logger";
 import { QueryExecResult } from "@/interfaces/database";
+import { BaseDatabaseService } from "./BaseDatabaseService";
 // Dynamic import of initBackend to prevent worker context errors
 import type {
   WorkerRequest,
@@ -29,7 +30,10 @@ import type {
  * Note: File system operations are not available in the web platform
  * due to browser security restrictions. These methods throw appropriate errors.
  */
-export class WebPlatformService implements PlatformService {
+export class WebPlatformService
+  extends BaseDatabaseService
+  implements PlatformService
+{
   private static instanceCount = 0; // Debug counter
   private worker: Worker | null = null;
   private workerReady = false;
@@ -46,6 +50,7 @@ export class WebPlatformService implements PlatformService {
   private readonly messageTimeout = 30000; // 30 seconds
 
   constructor() {
+    super();
     WebPlatformService.instanceCount++;
 
     logger.debug("[WebPlatformService] Initializing web platform service");
@@ -668,105 +673,8 @@ export class WebPlatformService implements PlatformService {
     // SharedArrayBuffer initialization is handled by initBackend call in initializeWorker
   }
 
-  // Database utility methods
-  generateInsertStatement(
-    model: Record<string, unknown>,
-    tableName: string,
-  ): { sql: string; params: unknown[] } {
-    const keys = Object.keys(model);
-    const placeholders = keys.map(() => "?").join(", ");
-    const sql = `INSERT INTO ${tableName} (${keys.join(", ")}) VALUES (${placeholders})`;
-    const params = keys.map((key) => model[key]);
-    return { sql, params };
-  }
-
-  async updateDefaultSettings(
-    settings: Record<string, unknown>,
-  ): Promise<void> {
-    // Get current active DID and update that identity's settings
-    const activeIdentity = await this.getActiveIdentity();
-    const activeDid = activeIdentity.activeDid;
-
-    if (!activeDid) {
-      logger.warn(
-        "[WebPlatformService] No active DID found, cannot update default settings",
-      );
-      return;
-    }
-
-    const keys = Object.keys(settings);
-    const setClause = keys.map((key) => `${key} = ?`).join(", ");
-    const sql = `UPDATE settings SET ${setClause} WHERE accountDid = ?`;
-    const params = [...keys.map((key) => settings[key]), activeDid];
-    await this.dbExec(sql, params);
-  }
-
-  async updateActiveDid(did: string): Promise<void> {
-    await this.dbExec(
-      "INSERT OR REPLACE INTO active_identity (id, activeDid, lastUpdated) VALUES (1, ?, ?)",
-      [did, new Date().toISOString()],
-    );
-  }
-
-  async getActiveIdentity(): Promise<{ activeDid: string }> {
-    const result = await this.dbQuery(
-      "SELECT activeDid FROM active_identity WHERE id = 1",
-    );
-    return {
-      activeDid: (result?.values?.[0]?.[0] as string) || "",
-    };
-  }
-
-  async insertNewDidIntoSettings(did: string): Promise<void> {
-    // Import constants dynamically to avoid circular dependencies
-    const { DEFAULT_ENDORSER_API_SERVER, DEFAULT_PARTNER_API_SERVER } =
-      await import("@/constants/app");
-
-    // Use INSERT OR REPLACE to handle case where settings already exist for this DID
-    // This prevents duplicate accountDid entries and ensures data integrity
-    await this.dbExec(
-      "INSERT OR REPLACE INTO settings (accountDid, finishedOnboarding, apiServer, partnerApiServer) VALUES (?, ?, ?, ?)",
-      [did, false, DEFAULT_ENDORSER_API_SERVER, DEFAULT_PARTNER_API_SERVER],
-    );
-  }
-
-  async updateDidSpecificSettings(
-    did: string,
-    settings: Record<string, unknown>,
-  ): Promise<void> {
-    const keys = Object.keys(settings);
-    const setClause = keys.map((key) => `${key} = ?`).join(", ");
-    const sql = `UPDATE settings SET ${setClause} WHERE accountDid = ?`;
-    const params = [...keys.map((key) => settings[key]), did];
-    // Log update operation for debugging
-    logger.debug(
-      "[WebPlatformService] updateDidSpecificSettings",
-      sql,
-      JSON.stringify(params, null, 2),
-    );
-    await this.dbExec(sql, params);
-  }
-
-  async retrieveSettingsForActiveAccount(): Promise<Record<
-    string,
-    unknown
-  > | null> {
-    const result = await this.dbQuery("SELECT * FROM settings WHERE id = 1");
-    if (result?.values?.[0]) {
-      // Convert the row to an object
-      const row = result.values[0];
-      const columns = result.columns || [];
-      const settings: Record<string, unknown> = {};
-
-      columns.forEach((column, index) => {
-        if (column !== "id") {
-          // Exclude the id column
-          settings[column] = row[index];
-        }
-      });
-
-      return settings;
-    }
-    return null;
-  }
+  // Database utility methods - inherited from BaseDatabaseService
+  // generateInsertStatement, updateDefaultSettings, updateActiveDid,
+  // getActiveIdentity, insertNewDidIntoSettings, updateDidSpecificSettings,
+  // retrieveSettingsForActiveAccount are all inherited from BaseDatabaseService
 }

src/views/AccountViewView.vue

@@ -1488,18 +1488,21 @@ export default class AccountViewView extends Vue {
           status?: number;
         };
       };
-      logger.error("[Server Limits] Error retrieving limits:", {
-        error: error instanceof Error ? error.message : String(error),
-        did: did,
-        apiServer: this.apiServer,
-        imageServer: this.DEFAULT_IMAGE_API_SERVER,
-        partnerApiServer: this.partnerApiServer,
-        errorCode: axiosError?.response?.data?.error?.code,
-        errorMessage: axiosError?.response?.data?.error?.message,
-        httpStatus: axiosError?.response?.status,
-        needsUserMigration: true,
-        timestamp: new Date().toISOString(),
-      });
+      logger.warn(
+        "[Server Limits] Error retrieving limits, expected for unregistered users:",
+        {
+          error: error instanceof Error ? error.message : String(error),
+          did: did,
+          apiServer: this.apiServer,
+          imageServer: this.DEFAULT_IMAGE_API_SERVER,
+          partnerApiServer: this.partnerApiServer,
+          errorCode: axiosError?.response?.data?.error?.code,
+          errorMessage: axiosError?.response?.data?.error?.message,
+          httpStatus: axiosError?.response?.status,
+          needsUserMigration: true,
+          timestamp: new Date().toISOString(),
+        },
+      );
 
       // this.notify.error(this.limitsMessage, TIMEOUTS.STANDARD);
     } finally {

src/views/HomeView.vue

@@ -706,7 +706,7 @@ export default class HomeView extends Vue {
           };
 
           logger.warn(
-            "[HomeView Settings Trace] ⚠️ Registration check failed",
+            "[HomeView Settings Trace] ⚠️ Registration check failed, expected for unregistered users.",
             {
               error: errorMessage,
               did: this.activeDid,

src/views/NotFoundView.vue

@@ -60,7 +60,9 @@
                 stroke-linecap="round"
                 stroke-linejoin="round"
                 stroke-width="2"
-                d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6"
+                d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2
+                2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1
+                1 0 011 1v4a1 1 0 001 1m-6 0h6"
               ></path>
             </svg>
             Go Home

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 available
+        No onboarding meetings are available
       </p>
     </div>
 

src/views/OnboardMeetingMembersView.vue

@@ -77,6 +77,7 @@ import {
 } from "../libs/endorserServer";
 import { generateSaveAndActivateIdentity } from "../libs/util";
 import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
+import { NotificationIface } from "../constants/app";
 
 @Component({
   components: {
@@ -97,6 +98,7 @@ export default class OnboardMeetingMembersView extends Vue {
   projectLink = "";
   $route!: RouteLocationNormalizedLoaded;
   $router!: Router;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   userNameDialog!: InstanceType<typeof UserNameDialog>;
 

src/views/OnboardMeetingSetupView.vue

@@ -230,26 +230,28 @@
       class="mt-8 p-4 border rounded-lg bg-white shadow"
     >
       <div class="flex items-center justify-between">
-        <h2 class="text-2xl">Meeting Members</h2>
-      </div>
-      <div class="mt-4">
-        &bull; Page for Members
-        <span
-          class="ml-4 cursor-pointer text-blue-600"
-          title="Click to copy link for members"
-          @click="copyMembersLinkToClipboard"
-        >
-          <font-awesome icon="link" />
-        </span>
-        <a
-          v-if="!!currentMeeting.password"
-          :href="onboardMeetingMembersLink()"
-          class="ml-4 text-blue-600"
-          target="_blank"
-        >
-          <font-awesome icon="external-link" />
-        </a>
+        <h2 class="font-bold">Meeting Members</h2>
       </div>
+      <ul class="list-disc text-sm mt-4 mb-2 ps-4 space-y-2">
+        <li>
+          Page for Members:
+          <span
+            class="ml-4 cursor-pointer text-blue-600"
+            title="Click to copy link for members"
+            @click="copyMembersLinkToClipboard"
+          >
+            <font-awesome icon="link" />
+          </span>
+          <a
+            v-if="!!currentMeeting.password"
+            :href="onboardMeetingMembersLink()"
+            class="ml-4 text-blue-600"
+            target="_blank"
+          >
+            <font-awesome icon="external-link" />
+          </a>
+        </li>
+      </ul>
 
       <MembersList
         :password="currentMeeting.password || ''"

test-playwright/testUtils.ts

@@ -49,6 +49,10 @@ export async function importUserFromAccount(page: Page, id?: string): Promise<st
 
   await page.getByRole("button", { name: "Import" }).click();
 
+  // PHASE 1 FIX: Wait for registration status to settle
+  // This ensures that components have the correct isRegistered status
+  await waitForRegistrationStatusToSettle(page);
+
   return userZeroData.did;
 }
 
@@ -69,6 +73,11 @@ export async function importUser(page: Page, id?: string): Promise<string> {
   await expect(
     page.locator("#sectionUsageLimits").getByText("Checking")
   ).toBeHidden();
+  
+  // PHASE 1 FIX: Wait for registration check to complete and update UI elements
+  // This ensures that components like InviteOneView have the correct isRegistered status
+  await waitForRegistrationStatusToSettle(page);
+  
   return did;
 }
 
@@ -337,3 +346,78 @@ export function getElementWaitTimeout(): number {
 export function getPageLoadTimeout(): number {
   return getAdaptiveTimeout(30000, 1.4);
 }
+
+/**
+ * PHASE 1 FIX: Wait for registration status to settle
+ * 
+ * This function addresses the timing issue where:
+ * 1. User imports identity → Database shows isRegistered: false
+ * 2. HomeView loads → Starts async registration check
+ * 3. Other views load → Use cached isRegistered: false
+ * 4. Async check completes → Updates database to isRegistered: true
+ * 5. But other views don't re-check → Plus buttons don't appear
+ * 
+ * This function waits for the async registration check to complete
+ * without interfering with test navigation.
+ */
+export async function waitForRegistrationStatusToSettle(page: Page): Promise<void> {
+  try {
+    // Wait for the initial registration check to complete
+    // This is indicated by the "Checking" text disappearing from usage limits
+    await expect(
+      page.locator("#sectionUsageLimits").getByText("Checking")
+    ).toBeHidden({ timeout: 15000 });
+    
+    // Before navigating back to the page, we'll trigger a registration check
+    // by navigating to home and waiting for the registration process to complete
+
+    const currentUrl = page.url();
+    
+    // Navigate to home to trigger the registration check
+    await page.goto('./');
+    await page.waitForLoadState('networkidle');
+    
+    // Wait for the registration check to complete by monitoring the usage limits section
+    // This ensures the async registration check has finished
+    await page.waitForFunction(() => {
+      const usageLimits = document.querySelector('#sectionUsageLimits');
+      if (!usageLimits) return true; // No usage limits section, assume ready
+      
+      // Check if the "Checking..." spinner is gone
+      const checkingSpinner = usageLimits.querySelector('.fa-spin');
+      if (checkingSpinner) return false; // Still loading
+      
+      // Check if we have actual content (not just the spinner)
+      const hasContent = usageLimits.querySelector('p') || usageLimits.querySelector('button');
+      return hasContent !== null; // Has actual content, not just spinner
+    }, { timeout: 10000 });
+    
+    // Also navigate to account page to ensure activeDid is set and usage limits are loaded
+    await page.goto('./account');
+    await page.waitForLoadState('networkidle');
+    
+    // Wait for the usage limits section to be visible and loaded
+    await page.waitForFunction(() => {
+      const usageLimits = document.querySelector('#sectionUsageLimits');
+      if (!usageLimits) return false; // Section should exist on account page
+      
+      // Check if the "Checking..." spinner is gone
+      const checkingSpinner = usageLimits.querySelector('.fa-spin');
+      if (checkingSpinner) return false; // Still loading
+      
+      // Check if we have actual content (not just the spinner)
+      const hasContent = usageLimits.querySelector('p') || usageLimits.querySelector('button');
+      return hasContent !== null; // Has actual content, not just spinner
+    }, { timeout: 15000 });
+    
+    // Navigate back to the original page if it wasn't home
+    if (!currentUrl.includes('/')) {
+      await page.goto(currentUrl);
+      await page.waitForLoadState('networkidle');
+    }
+    
+  } catch (error) {
+    // Registration status check timed out, continuing anyway
+    // This may indicate the user is not registered or there's a server issue
+  }
+}