chore: synchronize package

Fix daily notification plugin integration and bundling
- Change from dynamic to static imports for @timesafari/daily-notification-plugin - Remove plugin from external dependencies in vite.config.capacitor.mts to ensure proper bundling - Add debug logging to DailyNotificationSection for troubleshooting - Update package-lock.json with latest dependencies
2025-11-11 01:04:20 +00:00 · 2025-11-10 04:23:45 +00:00 · 2025-11-10 02:55:07 +00:00 · 2025-11-08 08:31:42 -07:00 · 2025-11-06 08:56:33 -07:00 · 2025-11-06 08:54:11 -07:00
46 changed files with 4084 additions and 782 deletions
--- a/.husky/pre-commit
+++ b/.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..."
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -1151,28 +1151,28 @@ If you need to build manually or want to understand the individual steps:

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

-   ```bash
-   gem_path=$(which gem)
-   shortened_path="${gem_path:h:h}"
-   export GEM_HOME=$shortened_path
-   export GEM_PATH=$shortened_path
-   ```
+```bash
+gem_path=$(which gem)
+shortened_path="${gem_path:h:h}"
+export GEM_HOME=$shortened_path
+export GEM_PATH=$shortened_path
+```

-##### 1. Bump the version in package.json, then here
+##### 1. Bump the version in package.json for `MARKETING_VERSION`, then `grep CURRENT_PROJECT_VERSION ios/App/App.xcodeproj/project.pbxproj` and add 1 for the numbered version;

-   ```bash
-   cd ios/App && xcrun agvtool new-version 40 && perl -p -i -e "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 1.0.7;/g" App.xcodeproj/project.pbxproj && cd -
-   # Unfortunately this edits Info.plist directly.
-   #xcrun agvtool new-marketing-version 0.4.5
-   ```
+```bash
+cd ios/App && xcrun agvtool new-version 47 && perl -p -i -e "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 1.1.2;/g" App.xcodeproj/project.pbxproj && cd -
+# Unfortunately this edits Info.plist directly.
+#xcrun agvtool new-marketing-version 0.4.5
+```

 ##### 2. Build

-  Here's prod. Also available: test, dev
+Here's prod. Also available: test, dev

-  ```bash
-  npm run build:ios:prod
-  ```
+```bash
+npm run build:ios:prod
+```

 3.1. Use Xcode to build and run on simulator or device.

@@ -1197,7 +1197,8 @@ If you need to build manually or want to understand the individual steps:
  - It can take 15 minutes for the build to show up in the list of builds.
  - You'll probably have to "Manage" something about encryption, disallowed in France.
  - Then "Save" and "Add to Review" and "Resubmit to App Review".
- Eventually it'll be "Ready for Distribution" which means
+- Eventually it'll be "Ready for Distribution" which means it's live
+- When finished, bump package.json version

 ### Android Build

@@ -1315,26 +1316,26 @@ The recommended way to build for Android is using the automated build script:

 #### Android Manual Build Process

-##### 1. Bump the version in package.json, then here: android/app/build.gradle
+##### 1. Bump the version in package.json, then update these versions & run:

-  ```bash
-  perl -p -i -e 's/versionCode .*/versionCode 40/g' android/app/build.gradle
-  perl -p -i -e 's/versionName .*/versionName "1.0.7"/g' android/app/build.gradle
-  ```
+```bash
+perl -p -i -e 's/versionCode .*/versionCode 47/g' android/app/build.gradle
+perl -p -i -e 's/versionName .*/versionName "1.1.2"/g' android/app/build.gradle
+```

 ##### 2. Build

  Here's prod. Also available: test, dev

-  ```bash
-  npm run build:android:prod
-  ```
+```bash
+npm run build:android:prod
+```

 ##### 3. Open the project in Android Studio

-   ```bash
-   npx cap open android
-   ```
+```bash
+npx cap open android
+```

 ##### 4. Use Android Studio to build and run on emulator or device

@@ -1379,6 +1380,8 @@ At play.google.com/console:
 - Note that if you add testers, you have to go to "Publishing Overview" and send
  those changes or your (closed) testers won't see it.

+- When finished, bump package.json version
+
 ### Capacitor Operations

 ```bash
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

+
+## [1.1.2] - 2025.11.06
+
+### Fixed
+- Bad page when user follows prompt to backup seed
+
+
+## [1.1.1] - 2025.11.03
+
+### Added
+- Meeting onboarding via prompts
+- Emojis on gift feed
+- Starred projects with notification
+
+
 ## [1.0.7] - 2025.08.18

 ### Fixed
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -31,8 +31,8 @@ android {
        applicationId "app.timesafari.app"
        minSdkVersion rootProject.ext.minSdkVersion
        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 41
-        versionName "1.0.8"
+        versionCode 47
+        versionName "1.1.2"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        aaptOptions {
             // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
--- a/android/app/capacitor.build.gradle
+++ b/android/app/capacitor.build.gradle
@@ -18,6 +18,7 @@ dependencies {
    implementation project(':capacitor-share')
    implementation project(':capacitor-status-bar')
    implementation project(':capawesome-capacitor-file-picker')
+    implementation project(':timesafari-daily-notification-plugin')

 }

--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -36,6 +36,30 @@
            android:grantUriPermissions="true">
            <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
        </provider>
+
+        <!-- Daily Notification Plugin Receivers -->
+        <receiver
+            android:name="com.timesafari.dailynotification.DailyNotificationReceiver"
+            android:enabled="true"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.timesafari.daily.NOTIFICATION" />
+            </intent-filter>
+        </receiver>
+        <receiver
+            android:name="com.timesafari.dailynotification.BootReceiver"
+            android:directBootAware="true"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter android:priority="1000">
+                <!-- Delivered very early after reboot (before unlock) -->
+                <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
+                <!-- Delivered after the user unlocks / credential-encrypted storage is available -->
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <!-- Delivered after app update; great for rescheduling alarms without reboot -->
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+            </intent-filter>
+        </receiver>
    </application>

    <!-- Permissions -->
@@ -45,4 +69,15 @@
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.CAMERA" />
    <uses-feature android:name="android.hardware.camera" android:required="true" />
+
+    <!-- Notification permissions -->
+    <!-- POST_NOTIFICATIONS required for Android 13+ (API 33+) -->
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+
+    <!-- SCHEDULE_EXACT_ALARM required for Android 12+ (API 31+) to schedule exact alarms -->
+    <!-- Note: On Android 12+, users can grant/deny this permission -->
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+
+    <!-- RECEIVE_BOOT_COMPLETED needed to reschedule notifications after device reboot -->
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 </manifest>
--- a/android/app/src/main/assets/capacitor.plugins.json
+++ b/android/app/src/main/assets/capacitor.plugins.json
@@ -34,5 +34,9 @@
 	{
 		"pkg": "@capawesome/capacitor-file-picker",
 		"classpath": "io.capawesome.capacitorjs.plugins.filepicker.FilePickerPlugin"
+	},
+	{
+		"pkg": "@timesafari/daily-notification-plugin",
+		"classpath": "com.timesafari.dailynotification.DailyNotificationPlugin"
 	}
 ]
--- a/android/capacitor.settings.gradle
+++ b/android/capacitor.settings.gradle
@@ -28,3 +28,6 @@ project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacit

 include ':capawesome-capacitor-file-picker'
 project(':capawesome-capacitor-file-picker').projectDir = new File('../node_modules/@capawesome/capacitor-file-picker/android')
+
+include ':timesafari-daily-notification-plugin'
+project(':timesafari-daily-notification-plugin').projectDir = new File('../node_modules/@timesafari/daily-notification-plugin/android')
--- a/doc/daily-notification-plugin-integration-plan.md
+++ b/doc/daily-notification-plugin-integration-plan.md
--- a/ios/App/App.xcodeproj/project.pbxproj
+++ b/ios/App/App.xcodeproj/project.pbxproj
@@ -403,7 +403,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 41;
+				CURRENT_PROJECT_VERSION = 47;
 				DEVELOPMENT_TEAM = GM3FS5JQPH;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -413,7 +413,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.8;
+				MARKETING_VERSION = 1.1.2;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -430,7 +430,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 41;
+				CURRENT_PROJECT_VERSION = 47;
 				DEVELOPMENT_TEAM = GM3FS5JQPH;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -440,7 +440,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.8;
+				MARKETING_VERSION = 1.1.2;
 				PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "timesafari",
-  "version": "1.1.1-beta",
+  "version": "1.1.3-beta",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "timesafari",
-      "version": "1.1.1-beta",
+      "version": "1.1.3-beta",
      "dependencies": {
        "@capacitor-community/electron": "^5.0.1",
        "@capacitor-community/sqlite": "6.0.2",
@@ -37,6 +37,7 @@
        "@pvermeer/dexie-encrypted-addon": "^3.0.0",
        "@simplewebauthn/browser": "^10.0.0",
        "@simplewebauthn/server": "^10.0.0",
+        "@timesafari/daily-notification-plugin": "file:../daily-notification-plugin",
        "@tweenjs/tween.js": "^21.1.1",
        "@types/qrcode": "^1.5.5",
        "@veramo/core": "^5.6.0",
@@ -149,6 +150,43 @@
        "vite": "^5.2.0"
      }
    },
+    "../daily-notification-plugin": {
+      "name": "@timesafari/daily-notification-plugin",
+      "version": "1.0.8",
+      "license": "MIT",
+      "workspaces": [
+        "packages/*"
+      ],
+      "dependencies": {
+        "@capacitor/core": "^6.2.1"
+      },
+      "devDependencies": {
+        "@capacitor/android": "^6.2.1",
+        "@capacitor/cli": "^6.2.1",
+        "@capacitor/ios": "^6.2.1",
+        "@types/jest": "^29.5.0",
+        "@types/jsdom": "^21.1.7",
+        "@types/node": "^20.19.0",
+        "@typescript-eslint/eslint-plugin": "^5.57.0",
+        "@typescript-eslint/parser": "^5.57.0",
+        "eslint": "^8.37.0",
+        "jest": "^29.5.0",
+        "jest-environment-jsdom": "^30.0.5",
+        "jsdom": "^26.1.0",
+        "markdownlint-cli2": "^0.18.1",
+        "prettier": "^2.8.7",
+        "rimraf": "^4.4.0",
+        "rollup": "^3.20.0",
+        "rollup-plugin-typescript2": "^0.31.0",
+        "standard-version": "^9.5.0",
+        "ts-jest": "^29.1.0",
+        "typescript": "~5.2.0",
+        "vite": "^7.1.9"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
    "node_modules/@0no-co/graphql.web": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/@0no-co/graphql.web/-/graphql.web-1.2.0.tgz",
@@ -9605,6 +9643,10 @@
        "node": ">=10"
      }
    },
+    "node_modules/@timesafari/daily-notification-plugin": {
+      "resolved": "../daily-notification-plugin",
+      "link": true
+    },
    "node_modules/@tootallnate/once": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "timesafari",
-  "version": "1.1.1-beta",
+  "version": "1.1.3-beta",
  "description": "Time Safari Application",
  "author": {
    "name": "Time Safari Team"
@@ -166,6 +166,7 @@
    "@pvermeer/dexie-encrypted-addon": "^3.0.0",
    "@simplewebauthn/browser": "^10.0.0",
    "@simplewebauthn/server": "^10.0.0",
+    "@timesafari/daily-notification-plugin": "file:../daily-notification-plugin",
    "@tweenjs/tween.js": "^21.1.1",
    "@types/qrcode": "^1.5.5",
    "@veramo/core": "^5.6.0",
--- a/scripts/build-android.sh
+++ b/scripts/build-android.sh
@@ -436,7 +436,21 @@ fi
 log_info "Cleaning dist directory..."
 clean_build_artifacts "dist"

-# Step 4: Build Capacitor version with mode
+# Step 4: Run TypeScript type checking for test and production builds
+if [ "$BUILD_MODE" = "production" ] || [ "$BUILD_MODE" = "test" ]; then
+    log_info "Running TypeScript type checking for $BUILD_MODE mode..."
+    
+    if ! measure_time npm run type-check; then
+        log_error "TypeScript type checking failed for $BUILD_MODE mode!"
+        exit 2
+    fi
+    
+    log_success "TypeScript type checking completed for $BUILD_MODE mode"
+else
+    log_debug "Skipping TypeScript type checking for development mode"
+fi
+
+# Step 5: Build Capacitor version with mode
 if [ "$BUILD_MODE" = "development" ]; then
    safe_execute "Building Capacitor version (development)" "npm run build:capacitor" || exit 3
 elif [ "$BUILD_MODE" = "test" ]; then
@@ -445,23 +459,23 @@ elif [ "$BUILD_MODE" = "production" ]; then
    safe_execute "Building Capacitor version (production)" "npm run build:capacitor -- --mode production" || exit 3
 fi

-# Step 5: Clean Gradle build
+# Step 6: Clean Gradle build
 safe_execute "Cleaning Gradle build" "cd android && ./gradlew clean && cd .." || exit 4

-# Step 6: Build based on type
+# Step 7: Build based on type
 if [ "$BUILD_TYPE" = "debug" ]; then
    safe_execute "Assembling debug build" "cd android && ./gradlew assembleDebug && cd .." || exit 5
 elif [ "$BUILD_TYPE" = "release" ]; then
    safe_execute "Assembling release build" "cd android && ./gradlew assembleRelease && cd .." || exit 5
 fi

-# Step 7: Sync with Capacitor
+# Step 8: Sync with Capacitor
 safe_execute "Syncing with Capacitor" "npx cap sync android" || exit 6

-# Step 8: Generate assets
+# Step 9: Generate assets
 safe_execute "Generating assets" "npx capacitor-assets generate --android" || exit 7

-# Step 9: Build APK/AAB if requested
+# Step 10: Build APK/AAB if requested
 if [ "$BUILD_APK" = true ]; then
    if [ "$BUILD_TYPE" = "debug" ]; then
        safe_execute "Building debug APK" "cd android && ./gradlew assembleDebug && cd .." || exit 5
@@ -474,7 +488,7 @@ if [ "$BUILD_AAB" = true ]; then
    safe_execute "Building AAB" "cd android && ./gradlew bundleRelease && cd .." || exit 5
 fi

-# Step 10: Auto-run app if requested
+# Step 11: Auto-run app if requested
 if [ "$AUTO_RUN" = true ]; then
    log_step "Auto-running Android app..."
    safe_execute "Launching app" "npx cap run android" || {
@@ -485,7 +499,7 @@ if [ "$AUTO_RUN" = true ]; then
    log_success "Android app launched successfully!"
 fi

-# Step 11: Open Android Studio if requested
+# Step 12: Open Android Studio if requested
 if [ "$OPEN_STUDIO" = true ]; then
    safe_execute "Opening Android Studio" "npx cap open android" || exit 8
 fi
--- a/scripts/build-ios.sh
+++ b/scripts/build-ios.sh
@@ -381,7 +381,21 @@ safe_execute "Cleaning iOS build" "clean_ios_build" || exit 1
 log_info "Cleaning dist directory..."
 clean_build_artifacts "dist"

-# Step 4: Build Capacitor version with mode
+# Step 4: Run TypeScript type checking for test and production builds
+if [ "$BUILD_MODE" = "production" ] || [ "$BUILD_MODE" = "test" ]; then
+    log_info "Running TypeScript type checking for $BUILD_MODE mode..."
+    
+    if ! measure_time npm run type-check; then
+        log_error "TypeScript type checking failed for $BUILD_MODE mode!"
+        exit 2
+    fi
+    
+    log_success "TypeScript type checking completed for $BUILD_MODE mode"
+else
+    log_debug "Skipping TypeScript type checking for development mode"
+fi
+
+# Step 5: Build Capacitor version with mode
 if [ "$BUILD_MODE" = "development" ]; then
    safe_execute "Building Capacitor version (development)" "npm run build:capacitor" || exit 3
 elif [ "$BUILD_MODE" = "test" ]; then
@@ -390,16 +404,16 @@ elif [ "$BUILD_MODE" = "production" ]; then
    safe_execute "Building Capacitor version (production)" "npm run build:capacitor -- --mode production" || exit 3
 fi

-# Step 5: Sync with Capacitor
+# Step 6: Sync with Capacitor
 safe_execute "Syncing with Capacitor" "npx cap sync ios" || exit 6

-# Step 6: Generate assets
+# Step 7: Generate assets
 safe_execute "Generating assets" "npx capacitor-assets generate --ios" || exit 7

-# Step 7: Build iOS app
+# Step 8: Build iOS app
 safe_execute "Building iOS app" "build_ios_app" || exit 5

-# Step 8: Build IPA/App if requested
+# Step 9: Build IPA/App if requested
 if [ "$BUILD_IPA" = true ]; then
    log_info "Building IPA package..."
    cd ios/App
@@ -426,12 +440,12 @@ if [ "$BUILD_APP" = true ]; then
    log_success "App bundle built successfully"
 fi

-# Step 9: Auto-run app if requested
+# Step 10: Auto-run app if requested
 if [ "$AUTO_RUN" = true ]; then
    safe_execute "Auto-running iOS app" "auto_run_ios_app" || exit 9
 fi

-# Step 10: Open Xcode if requested
+# Step 11: Open Xcode if requested
 if [ "$OPEN_STUDIO" = true ]; then
    safe_execute "Opening Xcode" "npx cap open ios" || exit 8
 fi
--- a/src/assets/styles/tailwind.css
+++ b/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-[calc(100vh-3rem)] overflow-y-auto;
 	}

 	/* Markdown content styling to restore list elements */
--- 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">
-          Set Visibility to Meeting Members
+          {{ title }}
        </h3>
        <p class="text-sm mb-4">
-          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.)
+          {{ description }}
        </p>

-        <!-- Custom table area - you can customize this -->
-        <div v-if="shouldInitializeSelection" class="mb-4">
+        <!-- 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">
@@ -31,14 +31,15 @@
              </tr>
            </thead>
            <tbody>
-              <!-- Dynamic data from MembersList -->
+              <!-- 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"
                >
-                  No members need visibility settings
+                  {{ emptyStateText }}
                </td>
              </tr>
+              <!-- Member Rows -->
              <tr
                v-for="member in membersData || []"
                :key="member.member.memberId"
@@ -51,10 +52,24 @@
                        :checked="isMemberSelected(member.did)"
                        @change="toggleMemberSelection(member.did)"
                      />
-                      {{ member.name || SOMEONE_UNNAMED }}
+                      <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>

-                    <!-- Friend indicator - only show if they are already a contact -->
+                    <!-- Contact indicator - only show if they are already a contact -->
                    <font-awesome
                      v-if="member.isContact"
                      icon="user-circle"
@@ -65,10 +80,28 @@
                </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"
@@ -78,17 +111,16 @@
                ? 'bg-blue-600 text-white cursor-pointer'
                : 'bg-slate-400 text-slate-200 cursor-not-allowed',
            ]"
-            @click="setVisibilityForSelectedMembers"
+            @click="processSelectedMembers"
          >
-            Set Visibility
+            {{ 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"
          >
-            {{
-              membersData && membersData.length > 0 ? "Maybe Later" : "Cancel"
-            }}
+            Maybe Later
          </button>
        </div>
      </div>
@@ -101,26 +133,20 @@ import { Vue, Component, Prop } from "vue-facing-decorator";

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

@Component({
  mixins: [PlatformServiceMixin],
+  emits: ["close"],
 })
-export default class SetBulkVisibilityDialog extends Vue {
-  @Prop({ default: false }) visible!: boolean;
-  @Prop({ default: () => [] }) membersData!: MemberData[];
+export default class BulkMembersDialog extends Vue {
  @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!: (
@@ -132,8 +158,9 @@ export default class SetBulkVisibilityDialog extends Vue {
  notify!: ReturnType<typeof createNotifyHelpers>;

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

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

-  get shouldInitializeSelection() {
-    // This method will initialize selection when the dialog opens
-    if (!this.selectionInitialized) {
-      this.initializeSelection();
-      this.selectionInitialized = true;
-    }
-    return true;
+  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);
  }

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

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

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

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

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

      for (const member of selectedMembers) {
        try {
-          // If they're not a contact yet, add them as a contact first
+          // 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 (!member.isContact) {
-            await this.addAsContact(member);
+            // Organizer mode: set isRegistered to true, member mode: undefined
+            await this.addAsContact(
+              member,
+              this.isOrganizer ? true : undefined,
+            );
+            contactAddedCount++;
          }

          // 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
-      this.$notify(
-        {
-          group: "alert",
-          type: "success",
-          title: "Visibility Set Successfully",
-          text: `Visibility set for ${successCount} member${successCount === 1 ? "" : "s"}.`,
-        },
-        5000,
-      );
+      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,
+          );
+        }
+      }

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

-  async addAsContact(member: { did: string; name: string }) {
+  async admitMember(member: {
+    did: string;
+    name: string;
+    member: { memberId: string };
+  }) {
    try {
-      const newContact = {
+      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 = {
        did: member.did,
        name: member.name,
+        registered: isRegistered,
      };

      await this.$insertContact(newContact);
@@ -310,24 +446,20 @@ export default class SetBulkVisibilityDialog 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: "This user is already your contact, but your activities are not visible to them yet.",
+        text: message,
      },
      5000,
    );
  }
-
-  close() {
-    this.resetSelection();
-    this.$emit("close");
-  }
-
-  cancel() {
-    this.close();
-  }
 }
 </script>
--- a/src/components/EntityGrid.vue
+++ b/src/components/EntityGrid.vue
@@ -2,12 +2,55 @@
 GiftedDialog.vue to provide a reusable grid layout * for displaying people,
 projects, and special entities with selection. * * @author Matthew Raymer */
 <template>
-  <ul :class="gridClasses">
+  <!-- Quick Search -->
+  <div id="QuickSearch" class="mb-4 flex items-center text-sm">
+    <input
+      v-model="searchTerm"
+      type="text"
+      placeholder="Search…"
+      class="block w-full rounded-l border border-r-0 border-slate-400 px-3 py-1.5 placeholder:italic placeholder:text-slate-400 focus:outline-none"
+      @input="handleSearchInput"
+      @keydown.enter="performSearch"
+    />
+    <div
+      v-show="isSearching && searchTerm"
+      class="border-y border-slate-400 ps-2 py-1.5 text-center text-slate-400"
+    >
+      <font-awesome
+        icon="spinner"
+        class="fa-spin-pulse leading-[1.1]"
+      ></font-awesome>
+    </div>
+    <button
+      :disabled="!searchTerm"
+      class="px-2 py-1.5 rounded-r bg-white border border-l-0 border-slate-400 text-slate-400 disabled:cursor-not-allowed"
+      @click="clearSearch"
+    >
+      <font-awesome
+        :icon="searchTerm ? 'times' : 'magnifying-glass'"
+        class="fa-fw"
+      ></font-awesome>
+    </button>
+  </div>
+
+  <div
+    v-if="searchTerm && !isSearching && filteredEntities.length === 0"
+    class="mb-4 text-sm italic text-slate-500 text-center"
+  >
+    “{{ searchTerm }}” doesn't match any
+    {{ entityType === "people" ? "people" : "projects" }}. Try a different
+    search.
+  </div>
+
+  <ul
+    ref="scrollContainer"
+    class="border-t border-slate-300 mb-4 max-h-[60vh] overflow-y-auto"
+  >
    <!-- Special entities (You, Unnamed) for people grids -->
    <template v-if="entityType === 'people'">
      <!-- "You" entity -->
      <SpecialEntityCard
-        v-if="showYouEntity"
+        v-if="showYouEntity && !searchTerm.trim()"
        entity-type="you"
        label="You"
        icon="hand"
@@ -21,6 +64,7 @@ projects, and special entities with selection. * * @author Matthew Raymer */

      <!-- "Unnamed" entity -->
      <SpecialEntityCard
+        v-if="showUnnamedEntity && !searchTerm.trim()"
        entity-type="unnamed"
        :label="unnamedEntityName"
        icon="circle-question"
@@ -38,16 +82,60 @@ projects, and special entities with selection. * * @author Matthew Raymer */

    <!-- Entity cards (people or projects) -->
    <template v-if="entityType === 'people'">
-      <PersonCard
-        v-for="person in displayedEntities as Contact[]"
-        :key="person.did"
-        :person="person"
-        :conflicted="isPersonConflicted(person.did)"
-        :show-time-icon="true"
-        :notify="notify"
-        :conflict-context="conflictContext"
-        @person-selected="handlePersonSelected"
-      />
+      <!-- When showing contacts without search: split into recent and alphabetical -->
+      <template v-if="!searchTerm.trim()">
+        <!-- Recently Added Section -->
+        <template v-if="recentContacts.length > 0">
+          <li
+            class="text-xs font-semibold text-slate-500 uppercase pt-5 pb-1.5 px-2 border-b border-slate-300"
+          >
+            Recently Added
+          </li>
+          <PersonCard
+            v-for="person in recentContacts"
+            :key="person.did"
+            :person="person"
+            :conflicted="isPersonConflicted(person.did)"
+            :show-time-icon="true"
+            :notify="notify"
+            :conflict-context="conflictContext"
+            @person-selected="handlePersonSelected"
+          />
+        </template>
+
+        <!-- Alphabetical Section -->
+        <template v-if="alphabeticalContacts.length > 0">
+          <li
+            class="text-xs font-semibold text-slate-500 uppercase pt-5 pb-1.5 px-2 border-b border-slate-300"
+          >
+            Everyone Else
+          </li>
+          <PersonCard
+            v-for="person in alphabeticalContacts"
+            :key="person.did"
+            :person="person"
+            :conflicted="isPersonConflicted(person.did)"
+            :show-time-icon="true"
+            :notify="notify"
+            :conflict-context="conflictContext"
+            @person-selected="handlePersonSelected"
+          />
+        </template>
+      </template>
+
+      <!-- When searching: show filtered results normally -->
+      <template v-else>
+        <PersonCard
+          v-for="person in displayedEntities as Contact[]"
+          :key="person.did"
+          :person="person"
+          :conflicted="isPersonConflicted(person.did)"
+          :show-time-icon="true"
+          :notify="notify"
+          :conflict-context="conflictContext"
+          @person-selected="handlePersonSelected"
+        />
+      </template>
    </template>

    <template v-else-if="entityType === 'projects'">
@@ -63,28 +151,27 @@ projects, and special entities with selection. * * @author Matthew Raymer */
        @project-selected="handleProjectSelected"
      />
    </template>
-
-    <!-- Show All navigation -->
-    <ShowAllCard
-      v-if="shouldShowAll"
-      :entity-type="entityType"
-      :route-name="showAllRoute"
-      :query-params="showAllQueryParams"
-    />
  </ul>
 </template>

 <script lang="ts">
-import { Component, Prop, Vue, Emit } from "vue-facing-decorator";
+import { Component, Prop, Vue, Emit, Watch } from "vue-facing-decorator";
+import { useInfiniteScroll } from "@vueuse/core";
 import PersonCard from "./PersonCard.vue";
 import ProjectCard from "./ProjectCard.vue";
 import SpecialEntityCard from "./SpecialEntityCard.vue";
-import ShowAllCard from "./ShowAllCard.vue";
 import { Contact } from "../db/tables/contacts";
 import { PlanData } from "../interfaces/records";
 import { NotificationIface } from "../constants/app";
 import { UNNAMED_ENTITY_NAME } from "@/constants/entities";

+/**
+ * Constants for infinite scroll configuration
+ */
+const INITIAL_BATCH_SIZE = 20;
+const INCREMENT_SIZE = 20;
+const RECENT_CONTACTS_COUNT = 3;
+
 /**
 * EntityGrid - Unified grid layout for displaying people or projects
 *
@@ -93,7 +180,6 @@ import { UNNAMED_ENTITY_NAME } from "@/constants/entities";
 * - Special entity integration (You, Unnamed)
 * - Conflict detection integration
 * - Empty state messaging
- * - Show All navigation
 * - Event delegation for entity selection
 * - Warning notifications for conflicted entities
 * - Template streamlined with computed CSS properties
@@ -104,7 +190,6 @@ import { UNNAMED_ENTITY_NAME } from "@/constants/entities";
    PersonCard,
    ProjectCard,
    SpecialEntityCard,
-    ShowAllCard,
  },
 })
 export default class EntityGrid extends Vue {
@@ -112,14 +197,21 @@ export default class EntityGrid extends Vue {
  @Prop({ required: true })
  entityType!: "people" | "projects";

+  // Search state
+  searchTerm = "";
+  isSearching = false;
+  searchTimeout: NodeJS.Timeout | null = null;
+  filteredEntities: Contact[] | PlanData[] = [];
+
+  // Infinite scroll state
+  displayedCount = INITIAL_BATCH_SIZE;
+  infiniteScrollReset?: () => void;
+  scrollContainer?: HTMLElement;
+
  /** Array of entities to display */
  @Prop({ required: true })
  entities!: Contact[] | PlanData[];

-  /** Maximum number of entities to display */
-  @Prop({ default: 10 })
-  maxItems!: number;
-
  /** Active user's DID */
  @Prop({ required: true })
  activeDid!: string;
@@ -140,18 +232,14 @@ export default class EntityGrid extends Vue {
  @Prop({ default: true })
  showYouEntity!: boolean;

+  /** Whether to show the "Unnamed" entity for people grids */
+  @Prop({ default: true })
+  showUnnamedEntity!: boolean;
+
  /** Whether the "You" entity is selectable */
  @Prop({ default: true })
  youSelectable!: boolean;

-  /** Route name for "Show All" navigation */
-  @Prop({ default: "" })
-  showAllRoute!: string;
-
-  /** Query parameters for "Show All" navigation */
-  @Prop({ default: () => ({}) })
-  showAllQueryParams!: Record<string, string>;
-
  /** Notification function from parent component */
  @Prop()
  notify?: (notification: NotificationIface, timeout?: number) => void;
@@ -160,42 +248,31 @@ export default class EntityGrid extends Vue {
  @Prop({ default: "other party" })
  conflictContext!: string;

-  /** Whether to hide the "Show All" navigation */
-  @Prop({ default: false })
-  hideShowAll!: boolean;
-
  /**
   * Function to determine which entities to display (allows parent control)
   *
   * This function prop allows parent components to customize which entities
-   * are displayed in the grid, enabling advanced filtering, sorting, and
-   * display logic beyond the default simple slice behavior.
+   * are displayed in the grid, enabling advanced filtering and sorting.
+   * Note: Infinite scroll is disabled when this prop is provided.
   *
   * @param entities - The full array of entities (Contact[] or PlanData[])
   * @param entityType - The type of entities being displayed ("people" or "projects")
-   * @param maxItems - The maximum number of items to display (from maxItems prop)
   * @returns Filtered/sorted array of entities to display
   *
   * @example
   * // Custom filtering: only show contacts with profile images
-   * :display-entities-function="(entities, type, max) =>
-   *   entities.filter(e => e.profileImageUrl).slice(0, max)"
+   * :display-entities-function="(entities, type) =>
+   *   entities.filter(e => e.profileImageUrl)"
   *
   * @example
   * // Custom sorting: sort projects by name
-   * :display-entities-function="(entities, type, max) =>
-   *   entities.sort((a, b) => a.name.localeCompare(b.name)).slice(0, max)"
-   *
-   * @example
-   * // Advanced logic: different limits for different entity types
-   * :display-entities-function="(entities, type, max) =>
-   *   type === 'projects' ? entities.slice(0, 5) : entities.slice(0, max)"
+   * :display-entities-function="(entities, type) =>
+   *   entities.sort((a, b) => a.name.localeCompare(b.name))"
   */
  @Prop({ default: null })
  displayEntitiesFunction?: (
    entities: Contact[] | PlanData[],
    entityType: "people" | "projects",
-    maxItems: number,
  ) => Contact[] | PlanData[];

  /**
@@ -206,33 +283,60 @@ export default class EntityGrid extends Vue {
  }

  /**
-   * Computed CSS classes for the grid layout
+   * Computed entities to display - uses function prop if provided, otherwise uses infinite scroll
+   * When searching, returns filtered results with infinite scroll applied
   */
-  get gridClasses(): string {
-    const baseClasses = "grid gap-x-2 gap-y-4 text-center mb-4";
-
-    if (this.entityType === "projects") {
-      return `${baseClasses} grid-cols-3 md:grid-cols-4`;
-    } else {
-      return `${baseClasses} grid-cols-4 sm:grid-cols-5 md:grid-cols-6`;
+  get displayedEntities(): Contact[] | PlanData[] {
+    // If searching, return filtered results with infinite scroll
+    if (this.searchTerm.trim()) {
+      return this.filteredEntities.slice(0, this.displayedCount);
    }
+
+    // If custom function provided, use it (disables infinite scroll)
+    if (this.displayEntitiesFunction) {
+      return this.displayEntitiesFunction(this.entities, this.entityType);
+    }
+
+    // Default: projects use infinite scroll
+    if (this.entityType === "projects") {
+      return (this.entities as PlanData[]).slice(0, this.displayedCount);
+    }
+
+    // People: handled by recentContacts + alphabeticalContacts (both use displayedCount)
+    return [];
  }

  /**
-   * Computed entities to display - uses function prop if provided, otherwise defaults
+   * Get the 3 most recently added contacts (when showing contacts and not searching)
   */
-  get displayedEntities(): Contact[] | PlanData[] {
-    if (this.displayEntitiesFunction) {
-      return this.displayEntitiesFunction(
-        this.entities,
-        this.entityType,
-        this.maxItems,
-      );
+  get recentContacts(): Contact[] {
+    if (this.entityType !== "people" || this.searchTerm.trim()) {
+      return [];
    }
+    // Entities are already sorted by date added (newest first)
+    return (this.entities as Contact[]).slice(0, 3);
+  }

-    // Default implementation for backward compatibility
-    const maxDisplay = this.entityType === "projects" ? 7 : this.maxItems;
-    return this.entities.slice(0, maxDisplay);
+  /**
+   * Get the remaining contacts sorted alphabetically (when showing contacts and not searching)
+   * Uses infinite scroll to control how many are displayed
+   */
+  get alphabeticalContacts(): Contact[] {
+    if (this.entityType !== "people" || this.searchTerm.trim()) {
+      return [];
+    }
+    // Skip the first 3 (recent contacts) and sort the rest alphabetically
+    // Create a copy to avoid mutating the original array
+    const remaining = (this.entities as Contact[]).slice(RECENT_CONTACTS_COUNT);
+    const sorted = [...remaining].sort((a: Contact, b: Contact) => {
+      // Sort alphabetically by name, falling back to DID if name is missing
+      const nameA = (a.name || a.did).toLowerCase();
+      const nameB = (b.name || b.did).toLowerCase();
+      return nameA.localeCompare(nameB);
+    });
+    // Apply infinite scroll: show based on displayedCount (minus the 3 recent)
+    const toShow = Math.max(0, this.displayedCount - RECENT_CONTACTS_COUNT);
+    return sorted.slice(0, toShow);
  }

  /**
@@ -246,15 +350,6 @@ export default class EntityGrid extends Vue {
    }
  }

-  /**
-   * Whether to show the "Show All" navigation
-   */
-  get shouldShowAll(): boolean {
-    return (
-      !this.hideShowAll && this.entities.length > 0 && this.showAllRoute !== ""
-    );
-  }
-
  /**
   * Whether the "You" entity is conflicted
   */
@@ -328,6 +423,144 @@ export default class EntityGrid extends Vue {
    });
  }

+  /**
+   * Handle search input with debouncing
+   */
+  handleSearchInput(): void {
+    // Show spinner immediately when user types
+    this.isSearching = true;
+
+    // Clear existing timeout
+    if (this.searchTimeout) {
+      clearTimeout(this.searchTimeout);
+    }
+
+    // Set new timeout for 500ms delay
+    this.searchTimeout = setTimeout(() => {
+      this.performSearch();
+    }, 500);
+  }
+
+  /**
+   * Perform the actual search
+   */
+  async performSearch(): Promise<void> {
+    if (!this.searchTerm.trim()) {
+      this.filteredEntities = [];
+      this.displayedCount = INITIAL_BATCH_SIZE;
+      this.infiniteScrollReset?.();
+      return;
+    }
+
+    this.isSearching = true;
+
+    try {
+      // Simulate async search (in case we need to add API calls later)
+      await new Promise((resolve) => setTimeout(resolve, 100));
+
+      const searchLower = this.searchTerm.toLowerCase().trim();
+
+      if (this.entityType === "people") {
+        this.filteredEntities = (this.entities as Contact[])
+          .filter((contact: Contact) => {
+            const name = contact.name?.toLowerCase() || "";
+            const did = contact.did.toLowerCase();
+            return name.includes(searchLower) || did.includes(searchLower);
+          })
+          .sort((a: Contact, b: Contact) => {
+            // Sort alphabetically by name, falling back to DID if name is missing
+            const nameA = (a.name || a.did).toLowerCase();
+            const nameB = (b.name || b.did).toLowerCase();
+            return nameA.localeCompare(nameB);
+          });
+      } else {
+        this.filteredEntities = (this.entities as PlanData[])
+          .filter((project: PlanData) => {
+            const name = project.name?.toLowerCase() || "";
+            const handleId = project.handleId.toLowerCase();
+            return name.includes(searchLower) || handleId.includes(searchLower);
+          })
+          .sort((a: PlanData, b: PlanData) => {
+            // Sort alphabetically by name
+            return a.name.toLowerCase().localeCompare(b.name.toLowerCase());
+          });
+      }
+
+      // Reset displayed count when search completes
+      this.displayedCount = INITIAL_BATCH_SIZE;
+      this.infiniteScrollReset?.();
+    } finally {
+      this.isSearching = false;
+    }
+  }
+
+  /**
+   * Clear the search
+   */
+  clearSearch(): void {
+    this.searchTerm = "";
+    this.filteredEntities = [];
+    this.isSearching = false;
+    this.displayedCount = INITIAL_BATCH_SIZE;
+    this.infiniteScrollReset?.();
+
+    // Clear any pending timeout
+    if (this.searchTimeout) {
+      clearTimeout(this.searchTimeout);
+      this.searchTimeout = null;
+    }
+  }
+
+  /**
+   * Determine if more entities can be loaded
+   */
+  canLoadMore(): boolean {
+    if (this.displayEntitiesFunction) {
+      // Custom function disables infinite scroll
+      return false;
+    }
+
+    if (this.searchTerm.trim()) {
+      // Search mode: check filtered entities
+      return this.displayedCount < this.filteredEntities.length;
+    }
+
+    if (this.entityType === "projects") {
+      // Projects: check if more available
+      return this.displayedCount < this.entities.length;
+    }
+
+    // People: check if more alphabetical contacts available
+    // Total available = 3 recent + all alphabetical
+    const remaining = (this.entities as Contact[]).slice(RECENT_CONTACTS_COUNT);
+    const totalAvailable = RECENT_CONTACTS_COUNT + remaining.length;
+    return this.displayedCount < totalAvailable;
+  }
+
+  /**
+   * Initialize infinite scroll on mount
+   */
+  mounted(): void {
+    this.$nextTick(() => {
+      const container = this.$refs.scrollContainer as HTMLElement;
+
+      if (container) {
+        const { reset } = useInfiniteScroll(
+          container,
+          () => {
+            // Load more: increment displayedCount
+            this.displayedCount += INCREMENT_SIZE;
+          },
+          {
+            distance: 50, // pixels from bottom
+            canLoadMore: () => this.canLoadMore(),
+          },
+        );
+        this.infiniteScrollReset = reset;
+      }
+    });
+  }
+
  // Emit methods using @Emit decorator

  @Emit("entity-selected")
@@ -340,6 +573,33 @@ export default class EntityGrid extends Vue {
  } {
    return data;
  }
+
+  /**
+   * Watch for changes in search term to reset displayed count
+   */
+  @Watch("searchTerm")
+  onSearchTermChange(): void {
+    this.displayedCount = INITIAL_BATCH_SIZE;
+    this.infiniteScrollReset?.();
+  }
+
+  /**
+   * Watch for changes in entities prop to reset displayed count
+   */
+  @Watch("entities")
+  onEntitiesChange(): void {
+    this.displayedCount = INITIAL_BATCH_SIZE;
+    this.infiniteScrollReset?.();
+  }
+
+  /**
+   * Cleanup timeouts when component is destroyed
+   */
+  beforeUnmount(): void {
+    if (this.searchTimeout) {
+      clearTimeout(this.searchTimeout);
+    }
+  }
 }
 </script>

--- a/src/components/EntitySelectionStep.vue
+++ b/src/components/EntitySelectionStep.vue
@@ -3,10 +3,9 @@ from GiftedDialog.vue to handle the complete step 1 * entity selection interface
 with dynamic labeling and grid display. * * Features: * - Dynamic step labeling
 based on context * - EntityGrid integration for unified entity display * -
 Conflict detection and prevention * - Special entity handling (You, Unnamed) * -
-Show All navigation with context preservation * - Cancel functionality * - Event
-delegation for entity selection * - Warning notifications for conflicted
-entities * - Template streamlined with computed CSS properties * * @author
-Matthew Raymer */
+Cancel functionality * - Event delegation for entity selection * - Warning
+notifications for conflicted entities * - Template streamlined with computed CSS
+properties * * @author Matthew Raymer */
 <template>
  <div id="sectionGiftedGiver">
    <label class="block font-bold mb-4">
@@ -16,18 +15,14 @@ Matthew Raymer */
    <EntityGrid
      :entity-type="shouldShowProjects ? 'projects' : 'people'"
      :entities="shouldShowProjects ? projects : allContacts"
-      :max-items="10"
      :active-did="activeDid"
      :all-my-dids="allMyDids"
      :all-contacts="allContacts"
      :conflict-checker="conflictChecker"
      :show-you-entity="shouldShowYouEntity"
      :you-selectable="youSelectable"
-      :show-all-route="showAllRoute"
-      :show-all-query-params="showAllQueryParams"
      :notify="notify"
      :conflict-context="conflictContext"
-      :hide-show-all="hideShowAll"
      @entity-selected="handleEntitySelected"
    />

@@ -68,7 +63,6 @@ interface EntitySelectionEvent {
 * - EntityGrid integration for unified entity display
 * - Conflict detection and prevention
 * - Special entity handling (You, Unnamed)
- * - Show All navigation with context preservation
 * - Cancel functionality
 * - Event delegation for entity selection
 * - Warning notifications for conflicted entities
@@ -154,10 +148,6 @@ export default class EntitySelectionStep extends Vue {
  @Prop()
  notify?: (notification: NotificationIface, timeout?: number) => void;

-  /** Whether to hide the "Show All" navigation */
-  @Prop({ default: false })
-  hideShowAll!: boolean;
-
  /**
   * CSS classes for the cancel button
   */
@@ -222,59 +212,6 @@ export default class EntitySelectionStep extends Vue {
    return !this.conflictChecker(this.activeDid);
  }

-  /**
-   * Route name for "Show All" navigation
-   */
-  get showAllRoute(): string {
-    if (this.shouldShowProjects) {
-      return "discover";
-    } else if (this.allContacts.length > 0) {
-      return "contact-gift";
-    }
-    return "";
-  }
-
-  /**
-   * Query parameters for "Show All" navigation
-   */
-  get showAllQueryParams(): Record<string, string> {
-    const baseParams = {
-      stepType: this.stepType,
-      giverEntityType: this.giverEntityType,
-      recipientEntityType: this.recipientEntityType,
-      // Form field values to preserve
-      description: this.description,
-      amountInput: this.amountInput,
-      unitCode: this.unitCode,
-      offerId: this.offerId,
-      fromProjectId: this.fromProjectId,
-      toProjectId: this.toProjectId,
-      showProjects: this.showProjects.toString(),
-      isFromProjectView: this.isFromProjectView.toString(),
-    };
-
-    if (this.shouldShowProjects) {
-      // For project contexts, still pass entity type information
-      return baseParams;
-    }
-
-    return {
-      ...baseParams,
-      // Always pass both giver and recipient info for context preservation
-      giverProjectId: this.fromProjectId || "",
-      giverProjectName: this.giver?.name || "",
-      giverProjectImage: this.giver?.image || "",
-      giverProjectHandleId: this.giver?.handleId || "",
-      giverDid: this.giverEntityType === "person" ? this.giver?.did || "" : "",
-      recipientProjectId: this.toProjectId || "",
-      recipientProjectName: this.receiver?.name || "",
-      recipientProjectImage: this.receiver?.image || "",
-      recipientProjectHandleId: this.receiver?.handleId || "",
-      recipientDid:
-        this.recipientEntityType === "person" ? this.receiver?.did || "" : "",
-    };
-  }
-
  /**
   * Handle entity selection from EntityGrid
   */
--- a/src/components/FeedFilters.vue
+++ b/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>
--- a/src/components/GiftedDialog.vue
+++ b/src/components/GiftedDialog.vue
@@ -29,7 +29,6 @@
        :unit-code="unitCode"
        :offer-id="offerId"
        :notify="$notify"
-        :hide-show-all="hideShowAll"
        @entity-selected="handleEntitySelected"
        @cancel="cancel"
      />
@@ -117,7 +116,6 @@ export default class GiftedDialog extends Vue {
  @Prop() fromProjectId = "";
  @Prop() toProjectId = "";
  @Prop() isFromProjectView = false;
-  @Prop() hideShowAll = false;
  @Prop({ default: "person" }) giverEntityType = "person" as
    | "person"
    | "project";
@@ -233,7 +231,7 @@ export default class GiftedDialog extends Vue {
        apiServer: this.apiServer,
      });

-      this.allContacts = await this.$contacts();
+      this.allContacts = await this.$contactsByDateAdded();

      this.allMyDids = await retrieveAccountDids();

--- a/src/components/MembersList.vue
+++ b/src/components/MembersList.vue
@@ -1,197 +1,255 @@
 <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 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"
+  <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"
      >
-        <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>
+        <font-awesome icon="spinner" class="fa-spin-pulse" />
+      </div>

-                <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>
+      <!-- Members List -->

-              <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-else>
+        <div class="text-center text-red-600 my-4">
+          {{ decryptionErrorMessage() }}
+        </div>

-      <div v-if="membersToShow().length > 0" class="flex justify-between">
-        <!-- 
+        <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="manualRefresh"
+          <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"
        >
-          <font-awesome icon="rotate" :class="{ 'fa-spin': isLoading }" />
-          Refresh
-          <span class="text-xs">({{ countdownTimer }}s)</span>
-        </button>
+          <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>
-
-      <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"
-  />
+    <!-- Bulk Members Dialog for both admitting and setting visibility -->
+    <BulkMembersDialog
+      ref="bulkMembersDialog"
+      :active-did="activeDid"
+      :api-server="apiServer"
+      :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 SetBulkVisibilityDialog from "./SetBulkVisibilityDialog.vue";
+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;
@@ -208,7 +266,7 @@ interface DecryptedMember {

@Component({
  components: {
-    SetBulkVisibilityDialog,
+    BulkMembersDialog,
  },
  mixins: [PlatformServiceMixin],
 })
@@ -216,7 +274,6 @@ 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;
@@ -227,6 +284,7 @@ export default class MembersList extends Vue {
    return message;
  }

+  contacts: Array<Contact> = [];
  decryptedMembers: DecryptedMember[] = [];
  firstName = "";
  isLoading = true;
@@ -237,23 +295,11 @@ 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;
-
-  // Track previous visibility members to detect changes
-  previousVisibilityMembers: string[] = [];
+  previousMemberDidsIgnored: string[] = [];

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

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

-    // 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();
+    this.refreshData();
  }

  async fetchMembers() {
@@ -336,7 +367,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,
@@ -378,17 +412,76 @@ 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() {
@@ -412,92 +505,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);
  }

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

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

-        // 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(),
-        },
-      }));
+  convertDecryptedMemberToMemberData(
+    decryptedMember: DecryptedMember,
+  ): MemberData {
+    return {
+      did: decryptedMember.did,
+      name: decryptedMember.name,
+      isContact: !!this.getContactFor(decryptedMember.did),
+      member: {
+        memberId: decryptedMember.member.memberId.toString(),
+      },
+    };
  }

  /**
-   * 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)
+   * Show the bulk members dialog if conditions are met
+   * (admit pending members for organizers, add to contacts for non-organizers)
   */
-  shouldShowVisibilityDialog(): boolean {
-    const currentMembers = this.getMembersForVisibility();
+  async refreshData(bypassPromptIfAllWereIgnored = true) {
+    // Force refresh both contacts and members
+    this.contacts = await this.$getAllContacts();
+    await this.fetchMembers();

-    if (currentMembers.length === 0) {
-      return false;
+    const pendingMembers = this.isOrganizer
+      ? this.getPendingMembersToAdmit()
+      : this.getNonContactMembers();
+    if (pendingMembers.length === 0) {
+      this.startAutoRefresh();
+      return;
    }
-
-    // If no previous members tracked, show dialog
-    if (this.previousVisibilityMembers.length === 0) {
-      return true;
+    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;
+      }
    }
-
-    // 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;
+    this.stopAutoRefresh();
+    (this.$refs.bulkMembersDialog as BulkMembersDialog).open(pendingMembers);
  }

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

-  /**
-   * Show the visibility dialog if conditions are met
-   */
-  checkAndShowVisibilityDialog() {
-    if (this.shouldShowVisibilityDialog()) {
-      this.showSetBulkVisibilityDialog();
-    }
-    this.updatePreviousVisibilityMembers();
+    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",
@@ -510,6 +596,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
@@ -522,14 +609,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,
      );
@@ -632,19 +724,8 @@ export default class MembersList extends Vue {
    }
  }

-  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.stopAutoRefresh();
    this.lastRefreshTime = Date.now();
    this.countdownTimer = 10;

@@ -674,33 +755,6 @@ 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();
  }
@@ -718,23 +772,26 @@ export default class MembersList extends Vue {

 .btn-add-contact {
  /* stylelint-disable-next-line at-rule-no-unknown */
-  @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 
+  @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 w-6 h-6 flex items-center justify-center rounded-full 
-    bg-slate-100 text-slate-400 hover:text-slate-600 
+  @apply text-slate-400 hover:text-slate-600 
    transition-colors;
 }

-.btn-admission {
+.btn-admission-add {
  /* stylelint-disable-next-line at-rule-no-unknown */
-  @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 
+  @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>
--- a/src/components/PersonCard.vue
+++ b/src/components/PersonCard.vue
@@ -3,30 +3,25 @@ GiftedDialog.vue to handle person entity display * with selection states and
 conflict detection. * * @author Matthew Raymer */
 <template>
  <li :class="cardClasses" @click="handleClick">
-    <div class="relative w-fit mx-auto">
+    <div>
      <EntityIcon
        v-if="person.did"
        :contact="person"
-        class="!size-[3rem] mx-auto border border-slate-300 bg-white overflow-hidden rounded-full mb-1"
+        class="!size-[2rem] shrink-0 border border-slate-300 bg-white overflow-hidden rounded-full"
      />
      <font-awesome
        v-else
        icon="circle-question"
-        class="text-slate-400 text-5xl mb-1"
+        class="text-slate-400 text-5xl mb-1 shrink-0"
      />
-
-      <!-- Time icon overlay for contacts -->
-      <div
-        v-if="person.did && showTimeIcon"
-        class="rounded-full bg-slate-400 absolute bottom-0 right-0 p-1 translate-x-1/3"
-      >
-        <font-awesome icon="clock" class="block text-white text-xs w-[1em]" />
-      </div>
    </div>

-    <h3 :class="nameClasses">
-      {{ displayName }}
-    </h3>
+    <div class="overflow-hidden">
+      <h3 :class="nameClasses">
+        {{ displayName }}
+      </h3>
+      <p class="text-xs text-slate-500 truncate">{{ person.did }}</p>
+    </div>
  </li>
 </template>

@@ -81,29 +76,32 @@ export default class PersonCard extends Vue {
   * Computed CSS classes for the card
   */
  get cardClasses(): string {
+    const baseCardClasses =
+      "flex items-center gap-2 px-2 py-1.5 border-b border-slate-300";
+
    if (!this.selectable || this.conflicted) {
-      return "opacity-50 cursor-not-allowed";
+      return `${baseCardClasses} *:opacity-50 cursor-not-allowed`;
    }
-    return "cursor-pointer hover:bg-slate-50";
+
+    return `${baseCardClasses} cursor-pointer hover:bg-slate-50`;
  }

  /**
   * Computed CSS classes for the person name
   */
  get nameClasses(): string {
-    const baseClasses =
-      "text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden";
+    const baseNameClasses = "text-sm font-semibold truncate";

    if (this.conflicted) {
-      return `${baseClasses} text-slate-400`;
+      return `${baseNameClasses} text-slate-500`;
    }

    // Add italic styling for entities without set names
    if (!this.person.name) {
-      return `${baseClasses} italic text-slate-500`;
+      return `${baseNameClasses} italic text-slate-500`;
    }

-    return baseClasses;
+    return baseNameClasses;
  }

  /**
--- a/src/components/ProjectCard.vue
+++ b/src/components/ProjectCard.vue
@@ -2,25 +2,26 @@
 GiftedDialog.vue to handle project entity display * with selection states and
 issuer information. * * @author Matthew Raymer */
 <template>
-  <li class="cursor-pointer" @click="handleClick">
-    <div class="relative w-fit mx-auto">
-      <ProjectIcon
-        :entity-id="project.handleId"
-        :icon-size="48"
-        :image-url="project.image"
-        class="!size-[3rem] mx-auto border border-slate-300 bg-white overflow-hidden rounded-full mb-1"
-      />
-    </div>
+  <li
+    class="flex items-center gap-2 px-2 py-1.5 border-b border-slate-300 hover:bg-slate-50 cursor-pointer"
+    @click="handleClick"
+  >
+    <ProjectIcon
+      :entity-id="project.handleId"
+      :icon-size="48"
+      :image-url="project.image"
+      class="!size-[2rem] shrink-0 border border-slate-300 bg-white overflow-hidden rounded-full"
+    />

-    <h3
-      class="text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden"
-    >
-      {{ project.name || unnamedProject }}
-    </h3>
+    <div class="overflow-hidden">
+      <h3 class="text-sm font-semibold truncate">
+        {{ project.name || unnamedProject }}
+      </h3>

-    <div class="text-xs text-slate-500 truncate">
-      <font-awesome icon="user" class="fa-fw text-slate-400" />
-      {{ issuerDisplayName }}
+      <div class="text-xs text-slate-500 truncate">
+        <font-awesome icon="user" class="text-slate-400" />
+        {{ issuerDisplayName }}
+      </div>
    </div>
  </li>
 </template>
--- a/src/components/ShowAllCard.vue
+++ b/src/components/ShowAllCard.vue
@@ -1,66 +0,0 @@
-/** * ShowAllCard.vue - Show All navigation card component * * Extracted from
-GiftedDialog.vue to handle "Show All" navigation * for both people and projects
-entity types. * * @author Matthew Raymer */
-<template>
-  <li class="cursor-pointer">
-    <router-link :to="navigationRoute" class="block text-center">
-      <font-awesome icon="circle-right" class="text-blue-500 text-5xl mb-1" />
-      <h3
-        class="text-xs text-slate-500 font-medium italic text-ellipsis whitespace-nowrap overflow-hidden"
-      >
-        Show All
-      </h3>
-    </router-link>
-  </li>
-</template>
-
-<script lang="ts">
-import { Component, Prop, Vue } from "vue-facing-decorator";
-import { RouteLocationRaw } from "vue-router";
-
-/**
- * ShowAllCard - Displays "Show All" navigation for entity grids
- *
- * Features:
- * - Provides navigation to full entity listings
- * - Supports different routes based on entity type
- * - Maintains context through query parameters
- * - Consistent visual styling with other cards
- */
-@Component({ name: "ShowAllCard" })
-export default class ShowAllCard extends Vue {
-  /** Type of entities being shown */
-  @Prop({ required: true })
-  entityType!: "people" | "projects";
-
-  /** Route name to navigate to */
-  @Prop({ required: true })
-  routeName!: string;
-
-  /** Query parameters to pass to the route */
-  @Prop({ default: () => ({}) })
-  queryParams!: Record<string, string>;
-
-  /**
-   * Computed navigation route with query parameters
-   */
-  get navigationRoute(): RouteLocationRaw {
-    return {
-      name: this.routeName,
-      query: this.queryParams,
-    };
-  }
-}
-</script>
-
-<style scoped>
-/* Ensure router-link styling is consistent */
-a {
-  text-decoration: none;
-}
-
-a:hover .fa-circle-right {
-  transform: scale(1.1);
-  transition: transform 0.2s ease;
-}
-</style>
--- a/src/components/SpecialEntityCard.vue
+++ b/src/components/SpecialEntityCard.vue
@@ -63,23 +63,24 @@ export default class SpecialEntityCard extends Vue {
  conflictContext!: string;

  /**
-   * Computed CSS classes for the card container
+   * Computed CSS classes for the card
   */
  get cardClasses(): string {
-    const baseClasses = "block";
+    const baseCardClasses =
+      "flex items-center gap-2 px-2 py-1.5 border-b border-slate-300";

    if (!this.selectable || this.conflicted) {
-      return `${baseClasses} cursor-not-allowed opacity-50`;
+      return `${baseCardClasses} *:opacity-50 cursor-not-allowed`;
    }

-    return `${baseClasses} cursor-pointer`;
+    return `${baseCardClasses} cursor-pointer hover:bg-slate-50`;
  }

  /**
   * Computed CSS classes for the icon
   */
  get iconClasses(): string {
-    const baseClasses = "text-5xl mb-1";
+    const baseClasses = "text-[2rem]";

    if (this.conflicted) {
      return `${baseClasses} text-slate-400`;
@@ -101,7 +102,7 @@ export default class SpecialEntityCard extends Vue {
   */
  get nameClasses(): string {
    const baseClasses =
-      "text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden";
+      "text-sm font-semibold text-ellipsis whitespace-nowrap overflow-hidden";

    if (this.conflicted) {
      return `${baseClasses} text-slate-400`;
--- a/src/components/notifications/DailyNotificationSection.vue
+++ b/src/components/notifications/DailyNotificationSection.vue
@@ -0,0 +1,781 @@
+<template>
+  <section
+    v-if="notificationsSupported"
+    id="sectionDailyNotifications"
+    class="bg-slate-100 rounded-md overflow-hidden px-4 py-4 mt-8 mb-8"
+    aria-labelledby="dailyNotificationsHeading"
+  >
+    <h2 id="dailyNotificationsHeading" class="mb-2 font-bold">
+      Daily Notifications
+      <button
+        class="text-slate-400 fa-fw cursor-pointer"
+        aria-label="Learn more about native notifications"
+        @click.stop="showNativeNotificationInfo"
+      >
+        <font-awesome icon="circle-question" aria-hidden="true" />
+      </button>
+    </h2>
+
+    <div class="flex items-center justify-between">
+      <div>Daily Notification</div>
+      <!-- Toggle switch -->
+      <div
+        class="relative ml-2 cursor-pointer"
+        role="switch"
+        :aria-checked="nativeNotificationEnabled"
+        :aria-label="
+          nativeNotificationEnabled
+            ? 'Disable daily notifications'
+            : 'Enable daily notifications'
+        "
+        tabindex="0"
+        @click="toggleNativeNotification"
+      >
+        <!-- input -->
+        <input
+          :checked="nativeNotificationEnabled"
+          type="checkbox"
+          class="sr-only"
+          tabindex="-1"
+          readonly
+        />
+        <!-- line -->
+        <div
+          class="block bg-slate-500 w-14 h-8 rounded-full transition"
+          :class="{
+            'bg-blue-600': nativeNotificationEnabled,
+          }"
+        ></div>
+        <!-- dot -->
+        <div
+          class="dot absolute left-1 top-1 bg-slate-400 w-6 h-6 rounded-full transition"
+          :class="{
+            'left-7 bg-white': nativeNotificationEnabled,
+          }"
+        ></div>
+      </div>
+    </div>
+
+    <!-- Show "Open Settings" button when permissions are denied -->
+    <div
+      v-if="
+        notificationsSupported &&
+        notificationStatus &&
+        notificationStatus.permissions.notifications === 'denied'
+      "
+      class="mt-2"
+    >
+      <button
+        class="w-full px-3 py-2 bg-blue-600 text-white rounded text-sm font-medium"
+        @click="openNotificationSettings"
+      >
+        Open Settings
+      </button>
+      <p class="text-xs text-slate-500 mt-1 text-center">
+        Enable notifications in Settings > App info > Notifications
+      </p>
+    </div>
+
+    <!-- Time input section - show when enabled OR when no time is set -->
+    <div
+      v-if="nativeNotificationEnabled || !nativeNotificationTimeStorage"
+      class="mt-2"
+    >
+      <div
+        v-if="nativeNotificationEnabled"
+        class="flex items-center justify-between mb-2"
+      >
+        <span
+          >Scheduled for:
+          <span v-if="nativeNotificationTime">{{
+            nativeNotificationTime
+          }}</span>
+          <span v-else class="text-slate-500">Not set</span></span
+        >
+        <button
+          class="text-blue-500 text-sm"
+          @click="editNativeNotificationTime"
+        >
+          {{ showTimeEdit ? "Cancel" : "Edit Time" }}
+        </button>
+      </div>
+
+      <!-- Time input (shown when editing or when no time is set) -->
+      <div v-if="showTimeEdit || !nativeNotificationTimeStorage" class="mt-2">
+        <label class="block text-sm text-slate-600 mb-1">
+          Notification Time
+        </label>
+        <div class="flex items-center gap-2">
+          <input
+            v-model="nativeNotificationTimeStorage"
+            type="time"
+            class="rounded border border-slate-400 px-2 py-2"
+            @change="onTimeChange"
+          />
+          <button
+            v-if="showTimeEdit || nativeNotificationTimeStorage"
+            class="px-3 py-2 bg-blue-600 text-white rounded"
+            @click="saveTimeChange"
+          >
+            Save
+          </button>
+        </div>
+        <p
+          v-if="!nativeNotificationTimeStorage"
+          class="text-xs text-slate-500 mt-1"
+        >
+          Set a time before enabling notifications
+        </p>
+      </div>
+    </div>
+
+    <!-- Loading state -->
+    <div v-if="loading" class="mt-2 text-sm text-slate-500">Loading...</div>
+  </section>
+</template>
+
+<script lang="ts">
+/**
+ * DailyNotificationSection Component
+ *
+ * A self-contained component for managing daily notification scheduling
+ * in AccountViewView. This component handles platform detection, permission
+ * requests, scheduling, and state management for daily notifications.
+ *
+ * Features:
+ * - Platform capability detection (hides on unsupported platforms)
+ * - Permission request flow
+ * - Schedule/cancel notifications
+ * - Time editing with HTML5 time input
+ * - Settings persistence
+ * - Plugin state synchronization
+ *
+ * @author Generated for TimeSafari Daily Notification Integration
+ * @component
+ */
+
+import { Component, Vue } from "vue-facing-decorator";
+import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
+import { logger } from "@/utils/logger";
+import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
+import type {
+  NotificationStatus,
+  PermissionStatus,
+} from "@/services/PlatformService";
+import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
+import type { NotificationIface } from "@/constants/app";
+
+/**
+ * Convert 24-hour time format ("09:00") to 12-hour display format ("9:00 AM")
+ */
+function formatTimeForDisplay(time24: string): string {
+  if (!time24) return "";
+  const [hours, minutes] = time24.split(":");
+  const hourNum = parseInt(hours);
+  const isPM = hourNum >= 12;
+  const displayHour =
+    hourNum === 0 ? 12 : hourNum > 12 ? hourNum - 12 : hourNum;
+  return `${displayHour}:${minutes} ${isPM ? "PM" : "AM"}`;
+}
+
+@Component({
+  name: "DailyNotificationSection",
+  mixins: [PlatformServiceMixin],
+})
+export default class DailyNotificationSection extends Vue {
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
+
+  // Component state
+  notificationsSupported: boolean = false;
+  nativeNotificationEnabled: boolean = false;
+  nativeNotificationTime: string = ""; // Display format: "9:00 AM"
+  nativeNotificationTimeStorage: string = ""; // Plugin format: "09:00"
+  nativeNotificationTitle: string = "Daily Update";
+  nativeNotificationMessage: string = "Your daily notification is ready!";
+  showTimeEdit: boolean = false;
+  loading: boolean = false;
+  notificationStatus: NotificationStatus | null = null;
+
+  // Notify helpers
+  private notify!: ReturnType<typeof createNotifyHelpers>;
+
+  async created(): Promise<void> {
+    this.notify = createNotifyHelpers(this.$notify);
+  }
+
+  /**
+   * Initialize component state on mount
+   * Checks platform support and syncs with plugin state
+   *
+   * **Token Refresh on Mount:**
+   * - Refreshes native fetcher configuration to ensure plugin has valid token
+   * - This handles cases where app was closed for extended periods
+   * - Token refresh happens automatically without user interaction
+   *
+   * **App Resume Listener:**
+   * - Listens for Capacitor 'resume' event to refresh token when app comes to foreground
+   * - Ensures plugin always has fresh token for background prefetch operations
+   * - Cleaned up in `beforeDestroy()` lifecycle hook
+   */
+  async mounted(): Promise<void> {
+    await this.initializeState();
+    // Refresh native fetcher configuration on mount
+    // This ensures plugin has valid token even if app was closed for extended periods
+    await this.refreshNativeFetcherConfig();
+    // Listen for app resume events to refresh token when app comes to foreground
+    // This is part of the proactive token refresh strategy
+    document.addEventListener("resume", this.handleAppResume);
+  }
+
+  /**
+   * Cleanup on component destroy
+   */
+  beforeDestroy(): void {
+    document.removeEventListener("resume", this.handleAppResume);
+  }
+
+  /**
+   * Handle app resume event - refresh native fetcher configuration
+   *
+   * This method is called when the app comes to foreground (via Capacitor 'resume' event).
+   * It proactively refreshes the JWT token to ensure the plugin has valid authentication
+   * for background prefetch operations.
+   *
+   * **Why refresh on resume?**
+   * - Tokens expire after 72 hours
+   * - App may have been closed for extended periods
+   * - Refreshing ensures plugin has valid token for next prefetch cycle
+   * - No user interaction required - happens automatically
+   *
+   * @see {@link refreshNativeFetcherConfig} For implementation details
+   */
+  async handleAppResume(): Promise<void> {
+    logger.debug(
+      "[DailyNotificationSection] App resumed, refreshing native fetcher config",
+    );
+    await this.refreshNativeFetcherConfig();
+  }
+
+  /**
+   * Refresh native fetcher configuration with fresh JWT token
+   *
+   * This method ensures the daily notification plugin has a valid authentication token
+   * for background prefetch operations. It's called proactively to prevent token expiration
+   * issues during offline periods.
+   *
+   * **Refresh Triggers:**
+   * - Component mount (when notification settings page loads)
+   * - App resume (when app comes to foreground)
+   * - Notification enabled (when user enables daily notifications)
+   *
+   * **Token Refresh Strategy (Hybrid Approach):**
+   * - Tokens are valid for 72 hours (see `accessTokenForBackground`)
+   * - Tokens are refreshed proactively when app is already open
+   * - If token expires while offline, plugin uses cached content
+   * - Next time app opens, token is automatically refreshed
+   *
+   * **Why This Approach?**
+   * - No app wake-up required (tokens refresh when app is already open)
+   * - Works offline (72-hour validity supports extended offline periods)
+   * - Automatic (no user interaction required)
+   * - Includes starred plans (fetcher receives user's starred plans for prefetch)
+   * - Graceful degradation (if refresh fails, cached content still works)
+   *
+   * **Error Handling:**
+   * - Errors are logged but not shown to user (background operation)
+   * - Returns early if notifications not supported or disabled
+   * - Returns early if API server not configured
+   * - Failures don't interrupt user experience
+   *
+   * @returns Promise that resolves when refresh completes (or fails silently)
+   *
+   * @example
+   * ```typescript
+   * // Called automatically on mount/resume
+   * await this.refreshNativeFetcherConfig();
+   * ```
+   *
+   * @see {@link CapacitorPlatformService.configureNativeFetcher} For token generation
+   * @see {@link accessTokenForBackground} For 72-hour token generation
+   */
+  async refreshNativeFetcherConfig(): Promise<void> {
+    try {
+      const platformService = PlatformServiceFactory.getInstance();
+
+      // Early return: Only refresh if notifications are supported and enabled
+      // This prevents unnecessary work when notifications aren't being used
+      if (!this.notificationsSupported || !this.nativeNotificationEnabled) {
+        return;
+      }
+
+      // Get settings for API server and starred plans
+      // API server tells plugin where to fetch content from
+      // Starred plans tell plugin which plans to prefetch
+      const settings = await this.$accountSettings();
+      const apiServer = settings.apiServer || "";
+
+      if (!apiServer) {
+        logger.warn(
+          "[DailyNotificationSection] No API server configured, skipping native fetcher refresh",
+        );
+        return;
+      }
+
+      // Get starred plans from settings
+      // These are passed to the plugin so it knows which plans to prefetch
+      const starredPlanHandleIds = settings.starredPlanHandleIds || [];
+
+      // Configure native fetcher with fresh token
+      // The jwt parameter is ignored - configureNativeFetcher generates it automatically
+      // This ensures we always have a fresh token with current expiration time
+      await platformService.configureNativeFetcher({
+        apiServer,
+        jwt: "", // Will be generated automatically by configureNativeFetcher
+        starredPlanHandleIds,
+      });
+
+      logger.info(
+        "[DailyNotificationSection] Native fetcher configuration refreshed",
+      );
+    } catch (error) {
+      // Don't show error to user - this is a background operation
+      // Failures are logged for debugging but don't interrupt user experience
+      // If refresh fails, plugin will use existing token (if still valid) or cached content
+      logger.error(
+        "[DailyNotificationSection] Failed to refresh native fetcher config:",
+        error,
+      );
+    }
+  }
+
+  /**
+   * Initialize component state
+   * Checks platform support and syncs with plugin state
+   */
+  async initializeState(): Promise<void> {
+    try {
+      this.loading = true;
+      const platformService = PlatformServiceFactory.getInstance();
+
+      logger.debug(
+        "[DailyNotificationSection] Checking notification support...",
+      );
+
+      // Check if notifications are supported on this platform
+      // This also verifies plugin availability (returns null if plugin unavailable)
+      const status = await platformService.getDailyNotificationStatus();
+      if (status === null) {
+        // Notifications not supported or plugin unavailable - don't initialize
+        this.notificationsSupported = false;
+        logger.warn(
+          "[DailyNotificationSection] Notifications not supported or plugin unavailable - section will be hidden",
+        );
+        return;
+      }
+
+      logger.debug(
+        "[DailyNotificationSection] Notifications supported, status:",
+        status,
+      );
+
+      this.notificationsSupported = true;
+      this.notificationStatus = status;
+
+      // Plugin state is the source of truth
+      if (status.isScheduled && status.scheduledTime) {
+        // Plugin has a scheduled notification - sync UI to match
+        this.nativeNotificationEnabled = true;
+        this.nativeNotificationTimeStorage = status.scheduledTime;
+        this.nativeNotificationTime = formatTimeForDisplay(
+          status.scheduledTime,
+        );
+      } else {
+        // No plugin schedule - UI defaults to disabled
+        this.nativeNotificationEnabled = false;
+        this.nativeNotificationTimeStorage = "";
+        this.nativeNotificationTime = "";
+      }
+    } catch (error) {
+      logger.error("[DailyNotificationSection] Failed to initialize:", error);
+      this.notificationsSupported = false;
+    } finally {
+      this.loading = false;
+    }
+  }
+
+  /**
+   * Toggle notification on/off
+   */
+  async toggleNativeNotification(): Promise<void> {
+    // Prevent multiple simultaneous toggles
+    if (this.loading) {
+      logger.warn(
+        "[DailyNotificationSection] Toggle ignored - operation in progress",
+      );
+      return;
+    }
+
+    logger.info(
+      `[DailyNotificationSection] Toggling notification: ${this.nativeNotificationEnabled} -> ${!this.nativeNotificationEnabled}`,
+    );
+
+    if (this.nativeNotificationEnabled) {
+      await this.disableNativeNotification();
+    } else {
+      await this.enableNativeNotification();
+    }
+  }
+
+  /**
+   * Enable daily notification
+   */
+  async enableNativeNotification(): Promise<void> {
+    try {
+      this.loading = true;
+      const platformService = PlatformServiceFactory.getInstance();
+
+      // Check if we have a time set
+      if (!this.nativeNotificationTimeStorage) {
+        this.notify.error(
+          "Please set a notification time first",
+          TIMEOUTS.SHORT,
+        );
+        this.loading = false;
+        return;
+      }
+
+      // Check permissions first - this also verifies plugin availability
+      let permissions: PermissionStatus | null;
+      try {
+        permissions = await platformService.checkNotificationPermissions();
+        logger.info(
+          `[DailyNotificationSection] Permission check result:`,
+          permissions,
+        );
+      } catch (error) {
+        // Plugin may not be available or there's an error
+        logger.error(
+          "[DailyNotificationSection] Failed to check permissions (plugin may be unavailable):",
+          error,
+        );
+        this.notify.error(
+          "Unable to check notification permissions. The notification plugin may not be installed.",
+          TIMEOUTS.LONG,
+        );
+        this.nativeNotificationEnabled = false;
+        return;
+      }
+
+      if (permissions === null) {
+        // Platform doesn't support notifications or plugin unavailable
+        logger.warn(
+          "[DailyNotificationSection] Notifications not supported or plugin unavailable",
+        );
+        this.notify.error(
+          "Notifications are not supported on this platform or the plugin is not installed.",
+          TIMEOUTS.SHORT,
+        );
+        this.nativeNotificationEnabled = false;
+        return;
+      }
+
+      logger.info(
+        `[DailyNotificationSection] Permission state: ${permissions.notifications}`,
+      );
+
+      // If permissions are explicitly denied, don't try to request again
+      // (this prevents the plugin crash when handling denied permissions)
+      // Android won't show the dialog again if permissions are permanently denied
+      if (permissions.notifications === "denied") {
+        logger.warn(
+          "[DailyNotificationSection] Permissions already denied, directing user to settings",
+        );
+        this.notify.error(
+          "Notification permissions were denied. Tap 'Open Settings' to enable them.",
+          TIMEOUTS.LONG,
+        );
+        this.nativeNotificationEnabled = false;
+        return;
+      }
+
+      // Only request if permissions are in "prompt" state (not denied, not granted)
+      // This ensures we only call requestPermissions when Android will actually show a dialog
+      if (permissions.notifications === "prompt") {
+        logger.info(
+          "[DailyNotificationSection] Permission state is 'prompt', requesting permissions...",
+        );
+        try {
+          const result = await platformService.requestNotificationPermissions();
+          logger.info(
+            `[DailyNotificationSection] Permission request result:`,
+            result,
+          );
+          if (result === null) {
+            // Plugin unavailable or request failed
+            logger.error(
+              "[DailyNotificationSection] Permission request returned null",
+            );
+            this.notify.error(
+              "Unable to request notification permissions. The plugin may not be available.",
+              TIMEOUTS.LONG,
+            );
+            this.nativeNotificationEnabled = false;
+            return;
+          }
+          if (!result.notifications) {
+            // Permission request was denied
+            logger.warn(
+              "[DailyNotificationSection] Permission request denied by user",
+            );
+            this.notify.error(
+              "Notification permissions are required. Tap 'Open Settings' to enable them.",
+              TIMEOUTS.LONG,
+            );
+            this.nativeNotificationEnabled = false;
+            return;
+          }
+          // Permissions granted - continue
+          logger.info(
+            "[DailyNotificationSection] Permissions granted successfully",
+          );
+        } catch (error) {
+          // Handle permission request errors (including plugin crashes)
+          logger.error(
+            "[DailyNotificationSection] Permission request failed:",
+            error,
+          );
+          this.notify.error(
+            "Unable to request notification permissions. Tap 'Open Settings' to enable them.",
+            TIMEOUTS.LONG,
+          );
+          this.nativeNotificationEnabled = false;
+          return;
+        }
+      } else if (permissions.notifications !== "granted") {
+        // Unexpected state - shouldn't happen, but handle gracefully
+        logger.warn(
+          `[DailyNotificationSection] Unexpected permission state: ${permissions.notifications}`,
+        );
+        this.notify.error(
+          "Unable to determine notification permission status. Tap 'Open Settings' to check.",
+          TIMEOUTS.LONG,
+        );
+        this.nativeNotificationEnabled = false;
+        return;
+      } else {
+        logger.info("[DailyNotificationSection] Permissions already granted");
+      }
+
+      // Permissions are granted - continue with scheduling
+
+      // Schedule notification via PlatformService
+      await platformService.scheduleDailyNotification({
+        time: this.nativeNotificationTimeStorage, // "09:00" in local time
+        title: this.nativeNotificationTitle,
+        body: this.nativeNotificationMessage,
+        sound: true,
+        priority: "high",
+      });
+
+      // Update UI state
+      this.nativeNotificationEnabled = true;
+
+      // Refresh native fetcher configuration with fresh token
+      // This ensures plugin has valid authentication when notifications are first enabled
+      // Token will be valid for 72 hours, supporting offline prefetch operations
+      await this.refreshNativeFetcherConfig();
+
+      this.notify.success(
+        "Daily notification scheduled successfully",
+        TIMEOUTS.SHORT,
+      );
+    } catch (error) {
+      logger.error(
+        "[DailyNotificationSection] Failed to enable notification:",
+        error,
+      );
+      this.notify.error(
+        "Failed to schedule notification. Please try again.",
+        TIMEOUTS.LONG,
+      );
+      this.nativeNotificationEnabled = false;
+    } finally {
+      this.loading = false;
+    }
+  }
+
+  /**
+   * Disable daily notification
+   */
+  async disableNativeNotification(): Promise<void> {
+    try {
+      this.loading = true;
+      const platformService = PlatformServiceFactory.getInstance();
+
+      // Cancel notification via PlatformService
+      await platformService.cancelDailyNotification();
+
+      // Update UI state
+      this.nativeNotificationEnabled = false;
+      this.nativeNotificationTime = "";
+      this.nativeNotificationTimeStorage = "";
+      this.showTimeEdit = false;
+
+      this.notify.success("Daily notification disabled", TIMEOUTS.SHORT);
+    } catch (error) {
+      logger.error(
+        "[DailyNotificationSection] Failed to disable notification:",
+        error,
+      );
+      this.notify.error(
+        "Failed to disable notification. Please try again.",
+        TIMEOUTS.LONG,
+      );
+    } finally {
+      this.loading = false;
+    }
+  }
+
+  /**
+   * Show/hide time edit input
+   */
+  editNativeNotificationTime(): void {
+    this.showTimeEdit = !this.showTimeEdit;
+  }
+
+  /**
+   * Handle time input change
+   */
+  onTimeChange(): void {
+    // Time is already in nativeNotificationTimeStorage via v-model
+    // Just update display format
+    if (this.nativeNotificationTimeStorage) {
+      this.nativeNotificationTime = formatTimeForDisplay(
+        this.nativeNotificationTimeStorage,
+      );
+    }
+  }
+
+  /**
+   * Save time change and update notification schedule
+   */
+  async saveTimeChange(): Promise<void> {
+    if (!this.nativeNotificationTimeStorage) {
+      this.notify.error("Please select a time", TIMEOUTS.SHORT);
+      return;
+    }
+
+    // Update display format
+    this.nativeNotificationTime = formatTimeForDisplay(
+      this.nativeNotificationTimeStorage,
+    );
+
+    // If notification is enabled, update the schedule
+    if (this.nativeNotificationEnabled) {
+      await this.updateNotificationTime(this.nativeNotificationTimeStorage);
+    } else {
+      // Just update local state (time preference stored in component)
+      this.showTimeEdit = false;
+      this.notify.success("Notification time saved", TIMEOUTS.SHORT);
+    }
+  }
+
+  /**
+   * Update notification time
+   * If notification is enabled, immediately updates the schedule
+   */
+  async updateNotificationTime(newTime: string): Promise<void> {
+    // newTime is in "HH:mm" format from HTML5 time input
+    if (!this.nativeNotificationEnabled) {
+      // If notification is disabled, just update local state
+      this.nativeNotificationTimeStorage = newTime;
+      this.nativeNotificationTime = formatTimeForDisplay(newTime);
+      this.showTimeEdit = false;
+      return;
+    }
+
+    // Notification is enabled - update the schedule
+    try {
+      this.loading = true;
+      const platformService = PlatformServiceFactory.getInstance();
+
+      // 1. Cancel existing notification
+      await platformService.cancelDailyNotification();
+
+      // 2. Schedule with new time
+      await platformService.scheduleDailyNotification({
+        time: newTime, // "09:00" in local time
+        title: this.nativeNotificationTitle,
+        body: this.nativeNotificationMessage,
+        sound: true,
+        priority: "high",
+      });
+
+      // 3. Update local state
+      this.nativeNotificationTimeStorage = newTime;
+      this.nativeNotificationTime = formatTimeForDisplay(newTime);
+
+      this.notify.success(
+        "Notification time updated successfully",
+        TIMEOUTS.SHORT,
+      );
+      this.showTimeEdit = false;
+    } catch (error) {
+      logger.error(
+        "[DailyNotificationSection] Failed to update notification time:",
+        error,
+      );
+      this.notify.error(
+        "Failed to update notification time. Please try again.",
+        TIMEOUTS.LONG,
+      );
+    } finally {
+      this.loading = false;
+    }
+  }
+
+  /**
+   * Show info dialog about native notifications
+   */
+  showNativeNotificationInfo(): void {
+    // TODO: Implement info dialog or navigate to help page
+    this.notify.info(
+      "Daily notifications use your device's native notification system. They work even when the app is closed.",
+      TIMEOUTS.STANDARD,
+    );
+  }
+
+  /**
+   * Open app notification settings
+   */
+  async openNotificationSettings(): Promise<void> {
+    try {
+      const platformService = PlatformServiceFactory.getInstance();
+      const result = await platformService.openAppNotificationSettings();
+      if (result === null) {
+        this.notify.error(
+          "Unable to open settings. Please go to Settings > Apps > TimeSafari > Notifications manually.",
+          TIMEOUTS.LONG,
+        );
+      } else {
+        this.notify.success("Opening notification settings...", TIMEOUTS.SHORT);
+      }
+    } catch (error) {
+      logger.error(
+        "[DailyNotificationSection] Failed to open notification settings:",
+        error,
+      );
+      this.notify.error(
+        "Unable to open settings. Please go to Settings > Apps > TimeSafari > Notifications manually.",
+        TIMEOUTS.LONG,
+      );
+    }
+  }
+}
+</script>
+
+<style scoped>
+.dot {
+  transition: left 0.2s ease;
+}
+</style>
--- a/src/constants/notifications.ts
+++ b/src/constants/notifications.ts
@@ -510,14 +510,6 @@ 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,15 +70,6 @@ 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,3 +4,4 @@ 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,3 +6,12 @@ export interface UserInfo {
  profileImageUrl?: string;
  nextPublicEncKeyHash?: string;
 }
+
+export interface MemberData {
+  did: string;
+  name: string;
+  isContact: boolean;
+  member: {
+    memberId: string;
+  };
+}
--- a/src/libs/crypto/index.ts
+++ b/src/libs/crypto/index.ts
@@ -104,6 +104,71 @@ export const accessToken = async (did?: string) => {
  }
 };

+/**
+ * Generate a longer-lived access token for background operations
+ *
+ * This function creates JWT tokens with extended validity (default 72 hours) for use
+ * in background prefetch operations. The longer expiration period allows the daily
+ * notification plugin to work offline for extended periods without requiring the app
+ * to be in the foreground to refresh tokens.
+ *
+ * **Token Refresh Strategy (Hybrid Approach):**
+ * - Tokens are valid for 72 hours (configurable)
+ * - Tokens are refreshed proactively when:
+ *   - App comes to foreground (via Capacitor 'resume' event)
+ *   - Component mounts (DailyNotificationSection)
+ *   - Notifications are enabled
+ * - If token expires while offline, plugin uses cached content
+ * - Next time app opens, token is automatically refreshed
+ *
+ * **Why 72 Hours?**
+ * - Balances security (read-only prefetch operations) with offline capability
+ * - Reduces need for app to wake itself for token refresh
+ * - Allows plugin to work offline for extended periods (e.g., weekend trips)
+ * - Longer than typical prefetch windows (5 minutes before notification)
+ *
+ * **Security Considerations:**
+ * - Tokens are used only for read-only prefetch operations
+ * - Tokens are stored securely in plugin's Room database
+ * - Tokens are refreshed proactively to minimize exposure window
+ * - No private keys are exposed to native code
+ *
+ * @param {string} did - User DID (Decentralized Identifier) for token issuer
+ * @param {number} expirationMinutes - Optional expiration in minutes (defaults to 72 hours = 4320 minutes)
+ * @return {Promise<string>} JWT token with extended validity, or empty string if no DID provided
+ *
+ * @example
+ * ```typescript
+ * // Generate token with default 72-hour expiration
+ * const token = await accessTokenForBackground("did:ethr:0x...");
+ *
+ * // Generate token with custom expiration (24 hours)
+ * const token24h = await accessTokenForBackground("did:ethr:0x...", 24 * 60);
+ * ```
+ *
+ * @see {@link accessToken} For short-lived tokens (1 minute) for regular API requests
+ * @see {@link createEndorserJwtForDid} For JWT creation implementation
+ */
+export const accessTokenForBackground = async (
+  did?: string,
+  expirationMinutes?: number,
+): Promise<string> => {
+  if (!did) {
+    return "";
+  }
+
+  // Use provided expiration or default to 72 hours (4320 minutes)
+  // This allows background prefetch operations to work offline for extended periods
+  const expirationSeconds = expirationMinutes
+    ? expirationMinutes * 60
+    : 72 * 60 * 60; // Default 72 hours
+
+  const nowEpoch = Math.floor(Date.now() / 1000);
+  const endEpoch = nowEpoch + expirationSeconds;
+  const tokenPayload = { exp: endEpoch, iat: nowEpoch, iss: did };
+  return createEndorserJwtForDid(did, tokenPayload);
+};
+
 /**
 * Extract JWT from various URL formats
 * @param jwtUrlText The URL containing the JWT
--- a/src/libs/endorserServer.ts
+++ b/src/libs/endorserServer.ts
@@ -42,9 +42,6 @@ import {
  PlanActionClaim,
  RegisterActionClaim,
  TenureClaim,
-} from "../interfaces/claims";
-
-import {
  GenericCredWrapper,
  GenericVerifiableCredential,
  AxiosErrorResponse,
@@ -55,14 +52,12 @@ import {
  QuantitativeValue,
  KeyMetaWithPrivate,
  KeyMetaMaybeWithPrivate,
-} from "../interfaces/common";
-import {
  OfferSummaryRecord,
  OfferToPlanSummaryRecord,
  PlanSummaryAndPreviousClaim,
  PlanSummaryRecord,
-} from "../interfaces/records";
-import { logger } from "../utils/logger";
+} from "../interfaces";
+import { logger, safeStringify } from "../utils/logger";
 import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
 import { APP_SERVER } from "@/constants/app";
 import { SOMEONE_UNNAMED } from "@/constants/entities";
@@ -1662,31 +1657,39 @@ export async function register(
      message?: string;
    }>(url, { jwtEncoded: vcJwt });

-    if (resp.data?.success?.handleId) {
-      return { success: true };
-    } else if (resp.data?.success?.embeddedRecordError) {
+    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 error:", JSON.stringify(resp.data));
-      return { error: "Got a server error when registering." };
+      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.",
+      };
    }
  } catch (error: unknown) {
    if (error && typeof error === "object") {
      const err = error as AxiosErrorResponse;
      const errorMessage =
-        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." };
+        err.response?.data?.error?.message ||
+        err.response?.data?.error ||
+        err.message;
+      logger.error(
+        "Registration thrown error:",
+        errorMessage || JSON.stringify(err),
+      );
+      return {
+        error:
+          (errorMessage as string) || "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,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,
--- a/src/services/PlatformService.ts
+++ b/src/services/PlatformService.ts
@@ -32,6 +32,68 @@ export interface PlatformCapabilities {
  isNativeApp: boolean;
 }

+/**
+ * Permission status for notifications
+ */
+export interface PermissionStatus {
+  /** Notification permission status */
+  notifications: "granted" | "denied" | "prompt";
+  /** Exact alarms permission status (Android only) */
+  exactAlarms?: "granted" | "denied" | "prompt";
+}
+
+/**
+ * Result of permission request
+ */
+export interface PermissionResult {
+  /** Whether notification permission was granted */
+  notifications: boolean;
+  /** Whether exact alarms permission was granted (Android only) */
+  exactAlarms?: boolean;
+}
+
+/**
+ * Status of scheduled daily notifications
+ */
+export interface NotificationStatus {
+  /** Whether a notification is currently scheduled */
+  isScheduled: boolean;
+  /** Scheduled time in "HH:mm" format (24-hour) */
+  scheduledTime?: string;
+  /** Last time the notification was triggered (ISO string) */
+  lastTriggered?: string;
+  /** Current permission status */
+  permissions: PermissionStatus;
+}
+
+/**
+ * Options for scheduling a daily notification
+ */
+export interface ScheduleOptions {
+  /** Time in "HH:mm" format (24-hour) in local time */
+  time: string;
+  /** Notification title */
+  title: string;
+  /** Notification body text */
+  body: string;
+  /** Whether to play sound (default: true) */
+  sound?: boolean;
+  /** Notification priority */
+  priority?: "high" | "normal" | "low";
+}
+
+/**
+ * Configuration for native fetcher background operations
+ */
+export interface NativeFetcherConfig {
+  /** API server URL */
+  apiServer: string;
+  /** JWT token for authentication */
+  jwt: string;
+  /** Array of starred plan handle IDs */
+  starredPlanHandleIds: string[];
+}
+
 /**
 * Platform-agnostic interface for handling platform-specific operations.
 * Provides a common API for file system operations, camera interactions,
@@ -209,6 +271,58 @@ export interface PlatformService {
   */
  retrieveSettingsForActiveAccount(): Promise<Record<string, unknown> | null>;

+  // Daily notification operations
+  /**
+   * Get the status of scheduled daily notifications
+   * @returns Promise resolving to notification status, or null if not supported
+   */
+  getDailyNotificationStatus(): Promise<NotificationStatus | null>;
+
+  /**
+   * Check notification permissions
+   * @returns Promise resolving to permission status, or null if not supported
+   */
+  checkNotificationPermissions(): Promise<PermissionStatus | null>;
+
+  /**
+   * Request notification permissions
+   * @returns Promise resolving to permission result, or null if not supported
+   */
+  requestNotificationPermissions(): Promise<PermissionResult | null>;
+
+  /**
+   * Schedule a daily notification
+   * @param options - Notification scheduling options
+   * @returns Promise that resolves when scheduled, or rejects if not supported
+   */
+  scheduleDailyNotification(options: ScheduleOptions): Promise<void>;
+
+  /**
+   * Cancel scheduled daily notification
+   * @returns Promise that resolves when cancelled, or rejects if not supported
+   */
+  cancelDailyNotification(): Promise<void>;
+
+  /**
+   * Configure native fetcher for background operations
+   * @param config - Native fetcher configuration
+   * @returns Promise that resolves when configured, or null if not supported
+   */
+  configureNativeFetcher(config: NativeFetcherConfig): Promise<void | null>;
+
+  /**
+   * Update starred plans for background fetcher
+   * @param plans - Starred plan IDs
+   * @returns Promise that resolves when updated, or null if not supported
+   */
+  updateStarredPlans(plans: { planIds: string[] }): Promise<void | null>;
+
+  /**
+   * Open the app's notification settings in the system settings
+   * @returns Promise that resolves when the settings page is opened, or null if not supported
+   */
+  openAppNotificationSettings(): Promise<void | null>;
+
  // --- PWA/Web-only methods (optional, only implemented on web) ---
  /**
   * Registers the service worker for PWA support (web only)
--- a/src/services/platforms/CapacitorPlatformService.ts
+++ b/src/services/platforms/CapacitorPlatformService.ts
@@ -13,6 +13,7 @@ import {
  CapacitorSQLite,
  DBSQLiteValues,
 } from "@capacitor-community/sqlite";
+import { DailyNotification } from "@timesafari/daily-notification-plugin";

 import { runMigrations } from "@/db-sql/migration";
 import { QueryExecResult } from "@/interfaces/database";
@@ -20,6 +21,11 @@ import {
  ImageResult,
  PlatformService,
  PlatformCapabilities,
+  NotificationStatus,
+  PermissionStatus,
+  PermissionResult,
+  ScheduleOptions,
+  NativeFetcherConfig,
 } from "../PlatformService";
 import { logger } from "../../utils/logger";
 import { BaseDatabaseService } from "./BaseDatabaseService";
@@ -91,16 +97,92 @@ export class CapacitorPlatformService
    }

    try {
-      // Create/Open database
-      this.db = await this.sqlite.createConnection(
-        this.dbName,
-        false,
-        "no-encryption",
-        1,
-        false,
-      );
+      // Try to create/Open database connection
+      try {
+        this.db = await this.sqlite.createConnection(
+          this.dbName,
+          false,
+          "no-encryption",
+          1,
+          false,
+        );
+      } catch (createError: unknown) {
+        // If connection already exists, try to retrieve it or handle gracefully
+        const errorMessage =
+          createError instanceof Error
+            ? createError.message
+            : String(createError);
+        const errorObj =
+          typeof createError === "object" && createError !== null
+            ? (createError as { errorMessage?: string; message?: string })
+            : {};

-      await this.db.open();
+        const fullErrorMessage =
+          errorObj.errorMessage || errorObj.message || errorMessage;
+
+        if (fullErrorMessage.includes("already exists")) {
+          logger.debug(
+            "[CapacitorPlatformService] Connection already exists on native side, attempting to retrieve",
+          );
+          // Check if connection exists in JavaScript Map
+          const isConnResult = await this.sqlite.isConnection(
+            this.dbName,
+            false,
+          );
+          if (isConnResult.result) {
+            // Connection exists in Map, retrieve it
+            this.db = await this.sqlite.retrieveConnection(this.dbName, false);
+            logger.debug(
+              "[CapacitorPlatformService] Successfully retrieved existing connection from Map",
+            );
+          } else {
+            // Connection exists on native side but not in JavaScript Map
+            // This can happen when the app is restarted but native connections persist
+            // Try to close the native connection first, then create a new one
+            logger.debug(
+              "[CapacitorPlatformService] Connection exists natively but not in Map, closing and recreating",
+            );
+            try {
+              await this.sqlite.closeConnection(this.dbName, false);
+            } catch (closeError) {
+              // Ignore close errors - connection might not be properly tracked
+              logger.debug(
+                "[CapacitorPlatformService] Error closing connection (may be expected):",
+                closeError,
+              );
+            }
+            // Now try to create the connection again
+            this.db = await this.sqlite.createConnection(
+              this.dbName,
+              false,
+              "no-encryption",
+              1,
+              false,
+            );
+            logger.debug(
+              "[CapacitorPlatformService] Successfully created connection after cleanup",
+            );
+          }
+        } else {
+          // Re-throw if it's a different error
+          throw createError;
+        }
+      }
+
+      // Open the connection if it's not already open
+      try {
+        await this.db.open();
+      } catch (openError: unknown) {
+        const openErrorMessage =
+          openError instanceof Error ? openError.message : String(openError);
+        // If already open, that's fine - continue
+        if (!openErrorMessage.includes("already open")) {
+          throw openError;
+        }
+        logger.debug(
+          "[CapacitorPlatformService] Database connection already open",
+        );
+      }

      // Set journal mode to WAL for better performance
      // await this.db.execute("PRAGMA journal_mode=WAL;");
@@ -1333,6 +1415,426 @@ export class CapacitorPlatformService
  // --- PWA/Web-only methods (no-op for Capacitor) ---
  public registerServiceWorker(): void {}

+  // Daily notification operations
+  /**
+   * Get the status of scheduled daily notifications
+   * @see PlatformService.getDailyNotificationStatus
+   */
+  async getDailyNotificationStatus(): Promise<NotificationStatus | null> {
+    try {
+      logger.debug(
+        "[CapacitorPlatformService] Getting daily notification status...",
+      );
+
+      const pluginStatus = await DailyNotification.getNotificationStatus();
+
+      // Get permissions separately
+      const permissions = await DailyNotification.checkPermissions();
+
+      // Map plugin PermissionState to our PermissionStatus format
+      const notificationsPermission = permissions.notifications;
+      let notifications: "granted" | "denied" | "prompt";
+
+      if (notificationsPermission === "granted") {
+        notifications = "granted";
+      } else if (notificationsPermission === "denied") {
+        notifications = "denied";
+      } else {
+        notifications = "prompt";
+      }
+
+      // Handle lastNotificationTime which can be a Promise<number>
+      let lastTriggered: string | undefined;
+      const lastNotificationTime = pluginStatus.lastNotificationTime;
+      if (lastNotificationTime) {
+        const timeValue = await Promise.resolve(lastNotificationTime);
+        if (typeof timeValue === "number") {
+          lastTriggered = new Date(timeValue).toISOString();
+        }
+      }
+
+      return {
+        isScheduled: pluginStatus.isScheduled ?? false,
+        scheduledTime: pluginStatus.settings?.time,
+        lastTriggered,
+        permissions: {
+          notifications,
+          exactAlarms: undefined, // Plugin doesn't expose this in status
+        },
+      };
+    } catch (error) {
+      const errorMessage =
+        error instanceof Error ? error.message : String(error);
+      logger.error(
+        "[CapacitorPlatformService] Failed to get notification status:",
+        errorMessage,
+        error,
+      );
+      logger.warn(
+        "[CapacitorPlatformService] Daily notification section will be hidden - plugin may not be installed or available",
+      );
+      return null;
+    }
+  }
+
+  /**
+   * Check notification permissions
+   * @see PlatformService.checkNotificationPermissions
+   */
+  async checkNotificationPermissions(): Promise<PermissionStatus | null> {
+    try {
+      const permissions = await DailyNotification.checkPermissions();
+
+      // Log the raw permission state for debugging
+      logger.info(
+        `[CapacitorPlatformService] Raw permission state from plugin:`,
+        permissions,
+      );
+
+      // Map plugin PermissionState to our PermissionStatus format
+      const notificationsPermission = permissions.notifications;
+      let notifications: "granted" | "denied" | "prompt";
+
+      // Handle all possible PermissionState values
+      if (notificationsPermission === "granted") {
+        notifications = "granted";
+      } else if (
+        notificationsPermission === "denied" ||
+        notificationsPermission === "ephemeral"
+      ) {
+        notifications = "denied";
+      } else {
+        // Treat "prompt", "prompt-with-rationale", "unknown", "provisional" as "prompt"
+        // This allows Android to show the permission dialog
+        notifications = "prompt";
+      }
+
+      logger.info(
+        `[CapacitorPlatformService] Mapped permission state: ${notifications} (from ${notificationsPermission})`,
+      );
+
+      return {
+        notifications,
+        exactAlarms: undefined, // Plugin doesn't expose this directly
+      };
+    } catch (error) {
+      logger.error(
+        "[CapacitorPlatformService] Failed to check permissions:",
+        error,
+      );
+      return null;
+    }
+  }
+
+  /**
+   * Request notification permissions
+   * @see PlatformService.requestNotificationPermissions
+   */
+  async requestNotificationPermissions(): Promise<PermissionResult | null> {
+    try {
+      logger.info(
+        `[CapacitorPlatformService] Requesting notification permissions...`,
+      );
+
+      const result = await DailyNotification.requestPermissions();
+
+      logger.info(
+        `[CapacitorPlatformService] Permission request result:`,
+        result,
+      );
+
+      // Map plugin PermissionState to boolean
+      const notificationsGranted = result.notifications === "granted";
+
+      logger.info(
+        `[CapacitorPlatformService] Mapped permission result: ${notificationsGranted} (from ${result.notifications})`,
+      );
+
+      return {
+        notifications: notificationsGranted,
+        exactAlarms: undefined, // Plugin doesn't expose this directly
+      };
+    } catch (error) {
+      logger.error(
+        "[CapacitorPlatformService] Failed to request permissions:",
+        error,
+      );
+      return null;
+    }
+  }
+
+  /**
+   * Schedule a daily notification
+   * @see PlatformService.scheduleDailyNotification
+   */
+  async scheduleDailyNotification(options: ScheduleOptions): Promise<void> {
+    try {
+      await DailyNotification.scheduleDailyNotification({
+        time: options.time,
+        title: options.title,
+        body: options.body,
+        sound: options.sound ?? true,
+        priority: options.priority ?? "high",
+      });
+
+      logger.info(
+        `[CapacitorPlatformService] Scheduled daily notification for ${options.time}`,
+      );
+    } catch (error) {
+      logger.error(
+        "[CapacitorPlatformService] Failed to schedule notification:",
+        error,
+      );
+      throw error;
+    }
+  }
+
+  /**
+   * Cancel scheduled daily notification
+   * @see PlatformService.cancelDailyNotification
+   */
+  async cancelDailyNotification(): Promise<void> {
+    try {
+      await DailyNotification.cancelAllNotifications();
+
+      logger.info("[CapacitorPlatformService] Cancelled daily notification");
+    } catch (error) {
+      logger.error(
+        "[CapacitorPlatformService] Failed to cancel notification:",
+        error,
+      );
+      throw error;
+    }
+  }
+
+  /**
+   * Configure native fetcher for background operations
+   *
+   * This method configures the daily notification plugin's native content fetcher
+   * with authentication credentials for background prefetch operations. It automatically
+   * retrieves the active DID from the database and generates a fresh JWT token with
+   * 72-hour expiration.
+   *
+   * **Authentication Flow:**
+   * 1. Retrieves active DID from `active_identity` table (single source of truth)
+   * 2. Generates JWT token with 72-hour expiration using `accessTokenForBackground()`
+   * 3. Configures plugin with API server URL, active DID, and JWT token
+   * 4. Plugin stores token in its Room database for background workers
+   *
+   * **Token Management:**
+   * - Tokens are valid for 72 hours (4320 minutes)
+   * - Tokens are refreshed proactively when app comes to foreground
+   * - If token expires while offline, plugin uses cached content
+   * - Token refresh happens automatically via `DailyNotificationSection.refreshNativeFetcherConfig()`
+   *
+   * **Offline-First Design:**
+   * - 72-hour validity supports extended offline periods
+   * - Plugin can prefetch content when online and use cached content when offline
+   * - No app wake-up required for token refresh (happens when app is already open)
+   *
+   * **Error Handling:**
+   * - Returns `null` if active DID not found (no user logged in)
+   * - Returns `null` if JWT generation fails
+   * - Logs errors but doesn't throw (allows graceful degradation)
+   *
+   * @param config - Native fetcher configuration
+   * @param config.apiServer - API server URL (optional, uses default if not provided)
+   * @param config.jwt - JWT token (ignored, generated automatically)
+   * @param config.starredPlanHandleIds - Array of starred plan handle IDs for prefetch
+   * @returns Promise that resolves when configured, or `null` if configuration failed
+   *
+   * @example
+   * ```typescript
+   * await platformService.configureNativeFetcher({
+   *   apiServer: "https://api.endorser.ch",
+   *   jwt: "", // Generated automatically
+   *   starredPlanHandleIds: ["plan-123", "plan-456"]
+   * });
+   * ```
+   *
+   * @see {@link accessTokenForBackground} For JWT token generation
+   * @see {@link DailyNotificationSection.refreshNativeFetcherConfig} For proactive token refresh
+   * @see PlatformService.configureNativeFetcher
+   */
+  async configureNativeFetcher(
+    config: NativeFetcherConfig,
+  ): Promise<void | null> {
+    try {
+      // Step 1: Get activeDid from database (single source of truth)
+      // This ensures we're using the correct user identity for authentication
+      const activeIdentity = await this.getActiveIdentity();
+      const activeDid = activeIdentity.activeDid;
+
+      if (!activeDid) {
+        logger.warn(
+          "[CapacitorPlatformService] No activeDid found, cannot configure native fetcher",
+        );
+        return null;
+      }
+
+      // Step 2: Generate JWT token for background operations
+      // Use 72-hour expiration for offline-first prefetch operations
+      // This allows the plugin to work offline for extended periods
+      const { accessTokenForBackground } = await import(
+        "../../libs/crypto/index"
+      );
+      // Use 72 hours (4320 minutes) for background prefetch tokens
+      // This is longer than passkey expiration to support offline scenarios
+      const expirationMinutes = 72 * 60; // 72 hours
+      const jwtToken = await accessTokenForBackground(
+        activeDid,
+        expirationMinutes,
+      );
+
+      if (!jwtToken) {
+        logger.error("[CapacitorPlatformService] Failed to generate JWT token");
+        return null;
+      }
+
+      // Step 3: Get API server from config or use default
+      // This ensures the plugin knows where to fetch content from
+      const apiServer =
+        config.apiServer ||
+        (await import("../../constants/app")).DEFAULT_ENDORSER_API_SERVER;
+
+      // Step 4: Configure plugin with credentials
+      // Plugin stores these in its Room database for background workers
+      await DailyNotification.configureNativeFetcher({
+        apiBaseUrl: apiServer,
+        activeDid,
+        jwtToken,
+      });
+
+      logger.info("[CapacitorPlatformService] Configured native fetcher", {
+        activeDid,
+        apiServer,
+        tokenExpirationHours: 72,
+        tokenExpirationMinutes: expirationMinutes,
+      });
+    } catch (error) {
+      logger.error(
+        "[CapacitorPlatformService] Failed to configure native fetcher:",
+        error,
+      );
+      return null;
+    }
+  }
+
+  /**
+   * Update starred plans for background fetcher
+   * @see PlatformService.updateStarredPlans
+   */
+  async updateStarredPlans(plans: { planIds: string[] }): Promise<void | null> {
+    try {
+      await DailyNotification.updateStarredPlans({
+        planIds: plans.planIds,
+      });
+
+      logger.info(
+        `[CapacitorPlatformService] Updated starred plans: ${plans.planIds.length} plans`,
+      );
+    } catch (error) {
+      logger.error(
+        "[CapacitorPlatformService] Failed to update starred plans:",
+        error,
+      );
+      return null;
+    }
+  }
+
+  /**
+   * Open the app's notification settings in the system settings
+   * @see PlatformService.openAppNotificationSettings
+   */
+  async openAppNotificationSettings(): Promise<void | null> {
+    try {
+      const platform = Capacitor.getPlatform();
+
+      if (platform === "android") {
+        // Android: Open app details settings page
+        // From there, users can navigate to "Notifications" section
+        // This is more reliable than trying to open notification settings directly
+        const packageName = "app.timesafari.app"; // Full application ID from build.gradle
+
+        // Use APPLICATION_DETAILS_SETTINGS which opens the app's settings page
+        // Users can then navigate to "Notifications" section
+        // Try multiple URL formats to ensure compatibility
+        const intentUrl1 = `intent:#Intent;action=android.settings.APPLICATION_DETAILS_SETTINGS;data=package:${packageName};end`;
+        const intentUrl2 = `intent://settings/app_detail?package=${packageName}#Intent;scheme=android-app;end`;
+
+        logger.info(
+          `[CapacitorPlatformService] Opening Android app settings for ${packageName}`,
+        );
+
+        // Log current permission state before opening settings
+        try {
+          const currentPerms = await this.checkNotificationPermissions();
+          logger.info(
+            `[CapacitorPlatformService] Current permission state before opening settings:`,
+            currentPerms,
+          );
+        } catch (e) {
+          logger.warn(
+            `[CapacitorPlatformService] Could not check permissions before opening settings:`,
+            e,
+          );
+        }
+
+        // Try multiple approaches to ensure it works
+        try {
+          // Method 1: Direct window.location.href (most reliable)
+          window.location.href = intentUrl1;
+
+          // Method 2: Fallback with window.open
+          setTimeout(() => {
+            try {
+              window.open(intentUrl1, "_blank");
+            } catch (e) {
+              logger.warn(
+                "[CapacitorPlatformService] window.open fallback failed:",
+                e,
+              );
+            }
+          }, 100);
+
+          // Method 3: Alternative format
+          setTimeout(() => {
+            try {
+              window.location.href = intentUrl2;
+            } catch (e) {
+              logger.warn(
+                "[CapacitorPlatformService] Alternative format failed:",
+                e,
+              );
+            }
+          }, 200);
+        } catch (e) {
+          logger.error(
+            "[CapacitorPlatformService] Failed to open intent URL:",
+            e,
+          );
+        }
+      } else if (platform === "ios") {
+        // iOS: Use app settings URL scheme
+        const settingsUrl = `app-settings:`;
+        window.location.href = settingsUrl;
+
+        logger.info("[CapacitorPlatformService] Opening iOS app settings");
+      } else {
+        logger.warn(
+          `[CapacitorPlatformService] Cannot open settings on platform: ${platform}`,
+        );
+        return null;
+      }
+    } catch (error) {
+      logger.error(
+        "[CapacitorPlatformService] Failed to open app notification settings:",
+        error,
+      );
+      return null;
+    }
+  }
+
  // Database utility methods - inherited from BaseDatabaseService
  // generateInsertStatement, updateDefaultSettings, updateActiveDid,
  // getActiveIdentity, insertNewDidIntoSettings, updateDidSpecificSettings,
--- a/src/services/platforms/ElectronPlatformService.ts
+++ b/src/services/platforms/ElectronPlatformService.ts
@@ -22,6 +22,13 @@

 import { CapacitorPlatformService } from "./CapacitorPlatformService";
 import { logger } from "../../utils/logger";
+import {
+  NotificationStatus,
+  PermissionStatus,
+  PermissionResult,
+  ScheduleOptions,
+  NativeFetcherConfig,
+} from "../PlatformService";

 /**
 * Electron-specific platform service implementation.
@@ -166,4 +173,88 @@ export class ElectronPlatformService extends CapacitorPlatformService {

  // --- PWA/Web-only methods (no-op for Electron) ---
  public registerServiceWorker(): void {}
+
+  // Daily notification operations
+  // Override CapacitorPlatformService methods to return null/throw errors
+  // since Electron doesn't support native daily notifications
+
+  /**
+   * Get the status of scheduled daily notifications
+   * @see PlatformService.getDailyNotificationStatus
+   * @returns null - notifications not supported on Electron platform
+   */
+  async getDailyNotificationStatus(): Promise<NotificationStatus | null> {
+    return null;
+  }
+
+  /**
+   * Check notification permissions
+   * @see PlatformService.checkNotificationPermissions
+   * @returns null - notifications not supported on Electron platform
+   */
+  async checkNotificationPermissions(): Promise<PermissionStatus | null> {
+    return null;
+  }
+
+  /**
+   * Request notification permissions
+   * @see PlatformService.requestNotificationPermissions
+   * @returns null - notifications not supported on Electron platform
+   */
+  async requestNotificationPermissions(): Promise<PermissionResult | null> {
+    return null;
+  }
+
+  /**
+   * Schedule a daily notification
+   * @see PlatformService.scheduleDailyNotification
+   * @throws Error - notifications not supported on Electron platform
+   */
+  async scheduleDailyNotification(_options: ScheduleOptions): Promise<void> {
+    throw new Error(
+      "Daily notifications are not supported on Electron platform",
+    );
+  }
+
+  /**
+   * Cancel scheduled daily notification
+   * @see PlatformService.cancelDailyNotification
+   * @throws Error - notifications not supported on Electron platform
+   */
+  async cancelDailyNotification(): Promise<void> {
+    throw new Error(
+      "Daily notifications are not supported on Electron platform",
+    );
+  }
+
+  /**
+   * Configure native fetcher for background operations
+   * @see PlatformService.configureNativeFetcher
+   * @returns null - native fetcher not supported on Electron platform
+   */
+  async configureNativeFetcher(
+    _config: NativeFetcherConfig,
+  ): Promise<void | null> {
+    return null;
+  }
+
+  /**
+   * Update starred plans for background fetcher
+   * @see PlatformService.updateStarredPlans
+   * @returns null - native fetcher not supported on Electron platform
+   */
+  async updateStarredPlans(_plans: {
+    planIds: string[];
+  }): Promise<void | null> {
+    return null;
+  }
+
+  /**
+   * Open the app's notification settings in the system settings
+   * @see PlatformService.openAppNotificationSettings
+   * @returns null - not supported on Electron platform
+   */
+  async openAppNotificationSettings(): Promise<void | null> {
+    return null;
+  }
 }
--- a/src/services/platforms/WebPlatformService.ts
+++ b/src/services/platforms/WebPlatformService.ts
@@ -2,6 +2,11 @@ import {
  ImageResult,
  PlatformService,
  PlatformCapabilities,
+  NotificationStatus,
+  PermissionStatus,
+  PermissionResult,
+  ScheduleOptions,
+  NativeFetcherConfig,
 } from "../PlatformService";
 import { logger } from "../../utils/logger";
 import { QueryExecResult } from "@/interfaces/database";
@@ -677,4 +682,81 @@ export class WebPlatformService
  // generateInsertStatement, updateDefaultSettings, updateActiveDid,
  // getActiveIdentity, insertNewDidIntoSettings, updateDidSpecificSettings,
  // retrieveSettingsForActiveAccount are all inherited from BaseDatabaseService
+
+  // Daily notification operations
+  /**
+   * Get the status of scheduled daily notifications
+   * @see PlatformService.getDailyNotificationStatus
+   * @returns null - notifications not supported on web platform
+   */
+  async getDailyNotificationStatus(): Promise<NotificationStatus | null> {
+    return null;
+  }
+
+  /**
+   * Check notification permissions
+   * @see PlatformService.checkNotificationPermissions
+   * @returns null - notifications not supported on web platform
+   */
+  async checkNotificationPermissions(): Promise<PermissionStatus | null> {
+    return null;
+  }
+
+  /**
+   * Request notification permissions
+   * @see PlatformService.requestNotificationPermissions
+   * @returns null - notifications not supported on web platform
+   */
+  async requestNotificationPermissions(): Promise<PermissionResult | null> {
+    return null;
+  }
+
+  /**
+   * Schedule a daily notification
+   * @see PlatformService.scheduleDailyNotification
+   * @throws Error - notifications not supported on web platform
+   */
+  async scheduleDailyNotification(_options: ScheduleOptions): Promise<void> {
+    throw new Error("Daily notifications are not supported on web platform");
+  }
+
+  /**
+   * Cancel scheduled daily notification
+   * @see PlatformService.cancelDailyNotification
+   * @throws Error - notifications not supported on web platform
+   */
+  async cancelDailyNotification(): Promise<void> {
+    throw new Error("Daily notifications are not supported on web platform");
+  }
+
+  /**
+   * Configure native fetcher for background operations
+   * @see PlatformService.configureNativeFetcher
+   * @returns null - native fetcher not supported on web platform
+   */
+  async configureNativeFetcher(
+    _config: NativeFetcherConfig,
+  ): Promise<void | null> {
+    return null;
+  }
+
+  /**
+   * Update starred plans for background fetcher
+   * @see PlatformService.updateStarredPlans
+   * @returns null - native fetcher not supported on web platform
+   */
+  async updateStarredPlans(_plans: {
+    planIds: string[];
+  }): Promise<void | null> {
+    return null;
+  }
+
+  /**
+   * Open the app's notification settings in the system settings
+   * @see PlatformService.openAppNotificationSettings
+   * @returns null - not supported on web platform
+   */
+  async openAppNotificationSettings(): Promise<void | null> {
+    return null;
+  }
 }
--- a/src/test/EntityGridFunctionPropTest.vue
+++ b/src/test/EntityGridFunctionPropTest.vue
@@ -19,7 +19,6 @@
      <EntityGrid
        entity-type="people"
        :entities="people"
-        :max-items="5"
        :active-did="activeDid"
        :all-my-dids="allMyDids"
        :all-contacts="people"
@@ -39,7 +38,6 @@
      <EntityGrid
        entity-type="projects"
        :entities="projects"
-        :max-items="3"
        :active-did="activeDid"
        :all-my-dids="allMyDids"
        :all-contacts="people"
@@ -152,11 +150,8 @@ export default class EntityGridFunctionPropTest extends Vue {
  customPeopleFunction = (
    entities: Contact[],
    _entityType: string,
-    maxItems: number,
  ): Contact[] => {
-    return entities
-      .filter((person) => person.profileImageUrl)
-      .slice(0, maxItems);
+    return entities.filter((person) => person.profileImageUrl);
  };

  /**
@@ -165,7 +160,6 @@ export default class EntityGridFunctionPropTest extends Vue {
  customProjectsFunction = (
    entities: PlanData[],
    _entityType: string,
-    _maxItems: number,
  ): PlanData[] => {
    return entities.sort((a, b) => a.name.localeCompare(b.name)).slice(0, 3);
  };
@@ -200,16 +194,16 @@ export default class EntityGridFunctionPropTest extends Vue {
   */
  get displayedPeopleCount(): number {
    if (this.useCustomFunction) {
-      return this.customPeopleFunction(this.people, "people", 5).length;
+      return this.customPeopleFunction(this.people, "people").length;
    }
-    return Math.min(5, this.people.length);
+    return Math.min(10, this.people.length); // Initial batch size for infinite scroll
  }

  get displayedProjectsCount(): number {
    if (this.useCustomFunction) {
-      return this.customProjectsFunction(this.projects, "projects", 3).length;
+      return this.customProjectsFunction(this.projects, "projects").length;
    }
-    return Math.min(7, this.projects.length);
+    return Math.min(10, this.projects.length); // Initial batch size for infinite scroll
  }
 }
 </script>
--- a/src/utils/PlatformServiceMixin.ts
+++ b/src/utils/PlatformServiceMixin.ts
@@ -970,6 +970,20 @@ export const PlatformServiceMixin = {
      return this.$normalizeContacts(rawContacts);
    },

+    /**
+     * Load all contacts sorted by when they were added (by ID)
+     * Always fetches fresh data from database for consistency
+     * Handles JSON string/object duality for contactMethods field
+     * @returns Promise<Contact[]> Array of normalized contact objects sorted by addition date (newest first)
+     */
+    async $contactsByDateAdded(): Promise<Contact[]> {
+      const rawContacts = (await this.$query(
+        "SELECT * FROM contacts ORDER BY id DESC",
+      )) as ContactMaybeWithJsonStrings[];
+
+      return this.$normalizeContacts(rawContacts);
+    },
+
    /**
     * Ultra-concise shortcut for getting number of contacts
     * @returns Promise<number> Total number of contacts
@@ -2057,6 +2071,7 @@ declare module "@vue/runtime-core" {

    // Specialized shortcuts - contacts cached, settings fresh
    $contacts(): Promise<Contact[]>;
+    $contactsByDateAdded(): Promise<Contact[]>;
    $contactCount(): Promise<number>;
    $settings(defaults?: Settings): Promise<Settings>;
    $accountSettings(did?: string, defaults?: Settings): Promise<Settings>;
--- a/src/views/AccountViewView.vue
+++ b/src/views/AccountViewView.vue
@@ -161,6 +161,9 @@
    </section>
    <PushNotificationPermission ref="pushNotificationPermission" />

+    <!-- Daily Notifications (Native) -->
+    <DailyNotificationSection />
+
    <!-- User Profile -->
    <section
      v-if="isRegistered"
@@ -790,6 +793,7 @@ import IdentitySection from "@/components/IdentitySection.vue";
 import RegistrationNotice from "@/components/RegistrationNotice.vue";
 import LocationSearchSection from "@/components/LocationSearchSection.vue";
 import UsageLimitsSection from "@/components/UsageLimitsSection.vue";
+import DailyNotificationSection from "@/components/notifications/DailyNotificationSection.vue";
 import {
  AppString,
  DEFAULT_IMAGE_API_SERVER,
@@ -858,6 +862,7 @@ interface UserNameDialogRef {
    RegistrationNotice,
    LocationSearchSection,
    UsageLimitsSection,
+    DailyNotificationSection,
  },
  mixins: [PlatformServiceMixin],
 })
--- a/src/views/ContactEditView.vue
+++ b/src/views/ContactEditView.vue
@@ -346,9 +346,7 @@ export default class ContactEditView extends Vue {

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

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

      <!-- Help button -->
-      <router-link
-        :to="{ name: 'help' }"
+      <button
        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]" />
-      </router-link>
+      </button>
    </div>

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

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

--- a/src/views/OnboardMeetingSetupView.vue
+++ b/src/views/OnboardMeetingSetupView.vue
@@ -473,6 +473,7 @@ 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 = {
@@ -482,7 +483,7 @@ export default class OnboardMeetingView extends Vue {
      };
      const encryptedContent = await encryptMessage(
        JSON.stringify(content),
-        this.newOrUpdatedMeetingInputs.password,
+        password,
      );

      const headers = await getHeaders(this.activeDid);
@@ -505,6 +506,11 @@ 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 };
      }
--- a/vite.config.capacitor.mts
+++ b/vite.config.capacitor.mts
@@ -1,4 +1,21 @@
 import { defineConfig } from "vite";
 import { createBuildConfig } from "./vite.config.common.mts";

-export default defineConfig(async () => createBuildConfig('capacitor')); 
+export default defineConfig(async () => {
+  const baseConfig = await createBuildConfig('capacitor');
+
+  return {
+    ...baseConfig,
+    build: {
+      ...baseConfig.build,
+      rollupOptions: {
+        ...baseConfig.build?.rollupOptions,
+        // Note: @timesafari/daily-notification-plugin is NOT externalized
+        // because it needs to be bundled for dynamic imports to work in Capacitor WebView
+        output: {
+          ...baseConfig.build?.rollupOptions?.output,
+        }
+      }
+    }
+  };
+});