Enhance commentary and logging.

Reviewed-on: #141

-1748433586226.log

@@ -1,101 +0,0 @@
-VM5:29 [Preload] Preload script starting...
-VM5:29 [Preload] Preload script completed successfully
-main.common-DiOUyXe7.js:27 Platform Object
-error @ main.common-DiOUyXe7.js:27
-main.common-DiOUyXe7.js:27 PWA enabled Object
-error @ main.common-DiOUyXe7.js:27
-main.common-DiOUyXe7.js:27 [Web] PWA enabled Object
-error @ main.common-DiOUyXe7.js:27
-main.common-DiOUyXe7.js:27 [Web] Platform Object
-error @ main.common-DiOUyXe7.js:27
-main.common-DiOUyXe7.js:29 Opened!
-main.common-DiOUyXe7.js:2552 Failed to log to database: Error: no such column: value
-    at E.handleError (main.common-DiOUyXe7.js:27:21133)
-    at E.exec (main.common-DiOUyXe7.js:27:19785)
-    at Rc.processQueue (main.common-DiOUyXe7.js:2379:2368)
-F7 @ main.common-DiOUyXe7.js:2552
-main.common-DiOUyXe7.js:2552 Original message: PWA enabled - [{"pwa_enabled":false}]
-F7 @ main.common-DiOUyXe7.js:2552
-main.common-DiOUyXe7.js:2552 Failed to log to database: Error: no such column: value
-    at E.handleError (main.common-DiOUyXe7.js:27:21133)
-    at E.exec (main.common-DiOUyXe7.js:27:19785)
-    at Rc.processQueue (main.common-DiOUyXe7.js:2379:2368)
-    at main.common-DiOUyXe7.js:2379:2816
-    at new Promise (<anonymous>)
-    at Rc.queueOperation (main.common-DiOUyXe7.js:2379:2685)
-    at Rc.query (main.common-DiOUyXe7.js:2379:3378)
-    at async F7 (main.common-DiOUyXe7.js:2552:117)
-F7 @ main.common-DiOUyXe7.js:2552
-main.common-DiOUyXe7.js:2552 Original message: [Web] PWA enabled - [{"pwa_enabled":false}]
-F7 @ main.common-DiOUyXe7.js:2552
-main.common-DiOUyXe7.js:2552 Failed to log to database: Error: no such column: value
-    at E.handleError (main.common-DiOUyXe7.js:27:21133)
-    at E.exec (main.common-DiOUyXe7.js:27:19785)
-    at Rc.processQueue (main.common-DiOUyXe7.js:2379:2368)
-    at main.common-DiOUyXe7.js:2379:2816
-    at new Promise (<anonymous>)
-    at Rc.queueOperation (main.common-DiOUyXe7.js:2379:2685)
-    at Rc.query (main.common-DiOUyXe7.js:2379:3378)
-    at async F7 (main.common-DiOUyXe7.js:2552:117)
-F7 @ main.common-DiOUyXe7.js:2552
-main.common-DiOUyXe7.js:2552 Original message: [Web] Platform - [{"platform":"web"}]
-F7 @ main.common-DiOUyXe7.js:2552
-main.common-DiOUyXe7.js:2552 Failed to log to database: Error: no such column: value
-    at E.handleError (main.common-DiOUyXe7.js:27:21133)
-    at E.exec (main.common-DiOUyXe7.js:27:19785)
-    at Rc.processQueue (main.common-DiOUyXe7.js:2379:2368)
-    at main.common-DiOUyXe7.js:2379:2816
-    at new Promise (<anonymous>)
-    at Rc.queueOperation (main.common-DiOUyXe7.js:2379:2685)
-    at Rc.query (main.common-DiOUyXe7.js:2379:3378)
-    at async F7 (main.common-DiOUyXe7.js:2552:117)
-F7 @ main.common-DiOUyXe7.js:2552
-main.common-DiOUyXe7.js:2552 Original message: Platform - [{"platform":"web"}]
-F7 @ main.common-DiOUyXe7.js:2552
-main.common-DiOUyXe7.js:2100 
-        
-        
-       GET https://api.endorser.ch/api/report/rateLimits 400 (Bad Request)
-(anonymous) @ main.common-DiOUyXe7.js:2100
-xhr @ main.common-DiOUyXe7.js:2100
-p6 @ main.common-DiOUyXe7.js:2102
-_request @ main.common-DiOUyXe7.js:2103
-request @ main.common-DiOUyXe7.js:2102
-Yc.<computed> @ main.common-DiOUyXe7.js:2103
-(anonymous) @ main.common-DiOUyXe7.js:2098
-dJ @ main.common-DiOUyXe7.js:2295
-main.common-DiOUyXe7.js:2100 
-        
-        
-       GET https://api.endorser.ch/api/report/rateLimits 400 (Bad Request)
-(anonymous) @ main.common-DiOUyXe7.js:2100
-xhr @ main.common-DiOUyXe7.js:2100
-p6 @ main.common-DiOUyXe7.js:2102
-_request @ main.common-DiOUyXe7.js:2103
-request @ main.common-DiOUyXe7.js:2102
-Yc.<computed> @ main.common-DiOUyXe7.js:2103
-(anonymous) @ main.common-DiOUyXe7.js:2098
-dJ @ main.common-DiOUyXe7.js:2295
-await in dJ
-checkRegistrationStatus @ HomeView-DJMSCuMg.js:1
-mounted @ HomeView-DJMSCuMg.js:1
-XMLHttpRequest.send
-(anonymous) @ main.common-DiOUyXe7.js:2100
-xhr @ main.common-DiOUyXe7.js:2100
-p6 @ main.common-DiOUyXe7.js:2102
-_request @ main.common-DiOUyXe7.js:2103
-request @ main.common-DiOUyXe7.js:2102
-Yc.<computed> @ main.common-DiOUyXe7.js:2103
-(anonymous) @ main.common-DiOUyXe7.js:2098
-ZG @ main.common-DiOUyXe7.js:2295
-await in ZG
-initializeIdentity @ HomeView-DJMSCuMg.js:1
-XMLHttpRequest.send
-(anonymous) @ main.common-DiOUyXe7.js:2100
-xhr @ main.common-DiOUyXe7.js:2100
-p6 @ main.common-DiOUyXe7.js:2102
-_request @ main.common-DiOUyXe7.js:2103
-request @ main.common-DiOUyXe7.js:2102
-Yc.<computed> @ main.common-DiOUyXe7.js:2103
-(anonymous) @ main.common-DiOUyXe7.js:2098
-dJ @ main.common-DiOUyXe7.js:2295

.env.development

@@ -2,7 +2,7 @@
 
 # iOS doesn't like spaces in the app title.
 TIME_SAFARI_APP_TITLE="TimeSafari_Dev"
-VITE_APP_SERVER=http://localhost:3000
+VITE_APP_SERVER=http://localhost:8080
 # This is the claim ID for actions in the BVC project, with the JWT ID on this environment (not production).
 VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https://endorser.ch/entity/01HWE8FWHQ1YGP7GFZYYPS272F
 VITE_DEFAULT_ENDORSER_API_SERVER=http://localhost:3000

.env.testing

@@ -3,7 +3,7 @@
 # iOS doesn't like spaces in the app title.
 TIME_SAFARI_APP_TITLE="TimeSafari_Test"
 VITE_APP_SERVER=https://test.timesafari.app
-# This is the claim ID for actions in the BVC project, with the JWT ID on this environment (not production).
+# This is the claim ID for actions in the BVC project.
 VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https://endorser.ch/entity/01HWE8FWHQ1YGP7GFZYYPS272F
 VITE_DEFAULT_ENDORSER_API_SERVER=https://test-api.endorser.ch
 

.gitignore

@@ -8,6 +8,7 @@ signature.bin
 # generated during `npm run build`
 sw_scripts-combined.js
 *.pem
+tsconfig.node.tsbuildinfo
 verified.txt
 myenv
 
@@ -40,17 +41,15 @@ pnpm-debug.log*
 playwright-tests
 dist-electron-packages
 .ruby-version
-+.env
 
 # Test files generated by scripts test-ios.js & test-android.js
 .generated/
 
-.env.default
 vendor/
 
-# Build logs
 build_logs/
 
-android/app/src/main/assets/public
+# PWA icon files generated by capacitor-assets
-android/app/src/main/res
+icons
 
+android/app/src/main/res/

CHANGELOG.md

@@ -6,6 +6,43 @@ 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).
 
 
+## [Unreleased]
+### Fixed
+- Set the environment variables correctly (so simulator deep link domain is right).
+### Changed
+- Photo is pinned to profile mode.
+- NODE_ENV is now mandatory.
+
+
+## [1.0.2] - 2025.06.20 - 276e0a741bc327de3380c4e508cccb7fee58c06d
+### Added
+- Version on feed title
+
+
+## [1.0.1] - 2025.06.20
+### Added
+- Allow a user to block someone else's content from view
+
+
+## [1.0.0] - 2025.06.20 - 5aa693de6337e5dbb278bfddc6bd39094bc14f73
+### Added
+- Web-oriented migration from IndexedDB to SQLite
+
+
+## [0.5.8]
+### Added
+- /deep-link/ path for URLs that are shared with people
+### Changed
+- External links now go to /deep-link/...
+- Feed visuals now have arrow imagery from giver to receiver
+
+
+## [0.4.7]
+### Fixed
+- Cameras everywhere
+### Changed
+- IndexedDB -> SQLite
+
 
 ## [0.4.5] - 2025.02.23
 ### Added

README.md

@@ -5,32 +5,25 @@ and expand to crowd-fund with time & money, then record and see the impact of co
 
 ## Roadmap
 
-See [project.task.yaml](project.task.yaml) for current priorities.
+See [ClickUp](https://sharing.clickup.com/9014278710/l/h/8cmnyhp-174/10573fec74e2ba0) for current priorities.
-(Numbers at the beginning of lines are estimated hours. See [taskyaml.org](https://taskyaml.org/) for details.)
 
 ## Setup & Building
 
 Quick start:
 
-* For setup, we recommend [pkgx](https://pkgx.dev), which installs what you need (either automatically or with the `dev` command). Core dependencies are typescript & npm; when building for other platforms, you'll need other things such as those in the pkgx.yaml & BUILDING.md files.
+* For setup, we recommend [pkgx](https://pkgx.dev), which installs what you need (either automatically or with the `dev` command). Core dependencies are typescript & npm; when building for other platforms, you'll need other things such as those in the pkgx.yaml & doc/BUILDING.md files.
 
 ```bash
 npm install
-npm run dev
+NODE_ENV=dev npm run start:web
 ```
 
-See [BUILDING.md](BUILDING.md) for more details.
+See [BUILDING.md](doc/BUILDING.md) for more details.
-
-
-
 
 ## Tests
 
 See [TESTING.md](test-playwright/TESTING.md) for detailed test instructions.
 
-
-
-
 ## Icons
 
 Application icons are in the `assets` directory, processed by the `capacitor-assets` command.
@@ -66,6 +59,18 @@ Key principles:
 - Common interfaces are shared through `common.ts`
 - Type definitions are generated from Zod schemas where possible
 
+### Database Architecture
+
+The application uses a platform-agnostic database layer:
+
+* `src/services/PlatformService.ts` - Database interface definition
+* `src/services/PlatformServiceFactory.ts` - Platform-specific service factory
+* `src/services/AbsurdSqlDatabaseService.ts` - SQLite implementation
+* `src/db/` - Legacy Dexie database (migration in progress)
+
+**Development Guidelines**:
+- Always use `PlatformService` for database operations
+
 ### Kudos
 
 Gifts make the world go 'round!

android/app/build.gradle

@@ -31,8 +31,8 @@ android {
         applicationId "app.timesafari.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 18
+        versionCode 35
-        versionName "0.4.7"
+        versionName "1.0.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

android/app/src/main/AndroidManifest.xml

@@ -13,6 +13,7 @@
             android:exported="true"
             android:label="@string/title_activity_main"
             android:launchMode="singleTask"
+            android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBarLaunch">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

android/app/src/main/assets/capacitor.config.json

@@ -32,7 +32,7 @@
 		}
 	},
 	"ios": {
-		"contentInset": "always",
+		"contentInset": "never",
 		"allowsLinkPreview": true,
 		"scrollEnabled": true,
 		"limitsNavigationsToAppBoundDomains": true,

android/app/src/main/java/app/timesafari/MainActivity.java

@@ -2,7 +2,7 @@ package app.timesafari;
 
 import android.os.Bundle;
 import com.getcapacitor.BridgeActivity;
-import com.getcapacitor.community.sqlite.SQLite;
+//import com.getcapacitor.community.sqlite.SQLite;
 
 public class MainActivity extends BridgeActivity {
     @Override
@@ -10,6 +10,6 @@ public class MainActivity extends BridgeActivity {
         super.onCreate(savedInstanceState);
         
         // Initialize SQLite
-        registerPlugin(SQLite.class);
+        //registerPlugin(SQLite.class);
     }
 } 

android/app/src/main/java/timesafari/app/MainActivity.java

@@ -1,5 +0,0 @@
-package timesafari.app;
-
-import com.getcapacitor.BridgeActivity;
-
-public class MainActivity extends BridgeActivity {}

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
+    <background>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+        <inset android:drawable="@mipmap/ic_launcher_background" android:inset="16.7%" />
+    </background>
+    <foreground>
+        <inset android:drawable="@mipmap/ic_launcher_foreground" android:inset="16.7%" />
+    </foreground>
 </adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
+    <background>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+        <inset android:drawable="@mipmap/ic_launcher_background" android:inset="16.7%" />
+    </background>
+    <foreground>
+        <inset android:drawable="@mipmap/ic_launcher_foreground" android:inset="16.7%" />
+    </foreground>
 </adaptive-icon>

capacitor.config.json

@@ -32,7 +32,7 @@
 		}
 	},
 	"ios": {
-		"contentInset": "always",
+		"contentInset": "never",
 		"allowsLinkPreview": true,
 		"scrollEnabled": true,
 		"limitsNavigationsToAppBoundDomains": true,

doc/BUILDING.md

@@ -9,32 +9,8 @@ For a quick dev environment setup, use [pkgx](https://pkgx.dev).
 - Node.js (LTS version recommended)
 - npm (comes with Node.js)
 - Git
-- For Android builds: Android Studio with SDK installed
-- For iOS builds: macOS with Xcode and ruby gems & bundle
-  - `pkgx +rubygems.org sh`
-
-  - ... 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
-   ```
-
 - For desktop builds: Additional build tools based on your OS
 
-## Forks
-
-If you have forked this to make your own app, you'll want to customize the iOS & Android files. You can either edit existing ones, or you can remove the `ios` and `android` directories and regenerate them before the `npx cap sync` step in each setup.
-
-   ```bash
-   npx cap add android
-   npx cap add ios
-   ```
-
-You'll also want to edit the deep link configuration (see below).
-
 ## Initial Setup
 
 Install dependencies:
@@ -46,7 +22,7 @@ Install dependencies:
 ## Web Dev Locally
 
    ```bash
-   npm run dev
+   NODE_ENV=dev npm run start:web
    ```
 
 ## Web Build for Server
@@ -54,7 +30,8 @@ Install dependencies:
 1. Run the production build:
 
    ```bash
-   npm run build:web
+   rm -rf dist
+   NODE_ENV=prod npm run build:web
    ```
 
    The built files will be in the `dist` directory.
@@ -64,7 +41,7 @@ Install dependencies:
    You'll likely want to use test locations for the Endorser & image & partner servers; see "DEFAULT_ENDORSER_API_SERVER" & "DEFAULT_IMAGE_API_SERVER" & "DEFAULT_PARTNER_API_SERVER" below.
 
    ```bash
-   npm run serve
+   NODE_ENV=dev npm run serve:web
    ```
 
 ### Compile and minify for test & production
@@ -75,16 +52,18 @@ Install dependencies:
 
 * Update the ClickUp tasks & CHANGELOG.md & the version in package.json, run `npm install`.
 
+* Run a build to make sure package-lock version is updated, linting works, etc: `npm install && npm run build:web`
+
 * Commit everything (since the commit hash is used the app).
 
-* Put the commit hash in the changelog (which will help you remember to bump the version later).
+* Put the commit hash in the changelog (which will help you remember to bump the version in the step later).
 
-* Tag with the new version, [online](https://gitea.anomalistdesign.com/trent_larson/crowd-funder-for-time-pwa/releases) or `git tag 0.3.55 && git push origin 0.3.55`.
+* Tag with the new version, [online](https://gitea.anomalistdesign.com/trent_larson/crowd-funder-for-time-pwa/releases) or `git tag 1.0.2 && git push origin 1.0.2`.
 
 * For test, build the app (because test server is not yet set up to build):
 
 ```bash
-TIME_SAFARI_APP_TITLE="TimeSafari_Test" VITE_APP_SERVER=https://test.timesafari.app VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https://endorser.ch/entity/01HWE8FWHQ1YGP7GFZYYPS272F VITE_DEFAULT_ENDORSER_API_SERVER=https://test-api.endorser.ch VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app VITE_DEFAULT_PARTNER_API_SERVER=https://test-partner-api.endorser.ch VITE_DEFAULT_PUSH_SERVER=https://test.timesafari.app VITE_PASSKEYS_ENABLED=true npm run build
+NODE_ENV=test TIME_SAFARI_APP_TITLE="TimeSafari_Test" VITE_APP_SERVER=https://test.timesafari.app VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https://endorser.ch/entity/01HWE8FWHQ1YGP7GFZYYPS272F VITE_DEFAULT_ENDORSER_API_SERVER=https://test-api.endorser.ch VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app VITE_DEFAULT_PARTNER_API_SERVER=https://test-partner-api.endorser.ch VITE_DEFAULT_PUSH_SERVER=https://test.timesafari.app VITE_PASSKEYS_ENABLED=true npm run build:web
 ```
 
    ... and transfer to the test server:
@@ -103,13 +82,13 @@ TIME_SAFARI_APP_TITLE="TimeSafari_Test" VITE_APP_SERVER=https://test.timesafari.
 
   * `pkgx +npm sh`
 
-  * `cd crowd-funder-for-time-pwa && git checkout master && git pull && git checkout 0.3.55 && npm install && npm run build && cd -`
+  * `cd crowd-funder-for-time-pwa && git checkout master && git pull && git checkout 1.0.2 && npm install && npm run build:web && cd -`
 
-  (The plain `npm run build` uses the .env.production file.)
+  (The plain `npm run build:web` uses the .env.production file.)
 
-* Back up the time-safari/dist folder & deploy: `mv time-safari/dist time-safari-dist-prev.0 && mv crowd-funder-for-time-pwa/dist time-safari/`
+* Back up the time-safari/dist folder & deploy: `mv time-safari/dist time-safari-dist-prev-2 && mv crowd-funder-for-time-pwa/dist time-safari/`
 
-* Record the new hash in the changelog. Edit package.json to increment version & add "-beta", `npm install`, and commit. Also record what version is on production.
+* Record the new hash in the changelog. Edit package.json to increment version & add "-beta", `npm install`, commit, and push. Also record what version is on production.
 
 ## Docker Deployment
 
@@ -226,10 +205,10 @@ docker run -d \
 
    ```bash
    # For AppImage (recommended)
-   npm run electron:build-linux
+   npm run build:electron-linux
 
    # For .deb package
-   npm run electron:build-linux-deb
+   npm run build:electron-linux-deb
    ```
 
 3. The packaged applications will be in `dist-electron-packages/`:
@@ -241,19 +220,19 @@ docker run -d \
 1. Build the electron app in production mode:
 
    ```bash
-   npm run build:web
+   NODE_ENV=prod npm run build:web
    npm run build:electron
-   npm run electron:build-mac
+   npm run build:electron-mac
    ```
 
 2. Package the Electron app for macOS:
 
    ```bash
    # For Intel Macs
-   npm run electron:build-mac
+   npm run build:electron-mac
 
    # For Universal build (Intel + Apple Silicon)
-   npm run electron:build-mac-universal
+   npm run build:electron-mac-universal
    ```
 
 3. The packaged applications will be in `dist-electron-packages/`:
@@ -275,7 +254,7 @@ For public distribution on macOS, you need to code sign and notarize your app:
 
 2. Build with signing:
    ```bash
-   npm run electron:build-mac
+   npm run build:electron-mac
    ```
 
 ### Running the Packaged App
@@ -314,10 +293,10 @@ For testing the Electron build before packaging:
 
 ```bash
 # Build and run in development mode (includes DevTools)
-npm run electron:dev
+npm run build:electron
 
 # Build in production mode and test
-npm run build:electron-prod && npm run electron:start
+npm run build:electron-prod && npm run start:electron
 ```
 
 ## Mobile Builds (Capacitor)
@@ -326,17 +305,33 @@ npm run build:electron-prod && npm run electron:start
 
 Prerequisites: macOS with Xcode installed
 
-1. Build the web assets:
+#### First-time iOS Configuration
+
+- Generate certificates inside XCode.
+
+- Right-click on App and under Signing & Capabilities set the Team.
+
+#### Each Release
+
+0. First time (or if dependencies change):
+
+  - `pkgx +rubygems.org sh`
+
+  - ... 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
+   ```
+
+1. Build the web assets & update ios:
 
    ```bash
    rm -rf dist
    npm run build:web
    npm run build:capacitor
-   ```
-
-2. Update iOS project with latest build:
-
-   ```bash
    npx cap sync ios
    ```
 
@@ -345,20 +340,20 @@ Prerequisites: macOS with Xcode installed
 3. Copy the assets:
 
    ```bash
+   # It makes no sense why capacitor-assets will not run without these but it actually changes the contents.
    mkdir -p ios/App/App/Assets.xcassets/AppIcon.appiconset
+   echo '{"images":[]}' > ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json
+   mkdir -p ios/App/App/Assets.xcassets/Splash.imageset
+   echo '{"images":[]}' > ios/App/App/Assets.xcassets/Splash.imageset/Contents.json
    npx capacitor-assets generate --ios
    ```
 
-4. Bump the version to match Android:
+4. Bump the version to match Android & package.json:
 
    ```
-   cd ios/App
+   cd ios/App && xcrun agvtool new-version 35 && perl -p -i -e "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 1.0.2;/g" App.xcodeproj/project.pbxproj && cd -
-   xcrun agvtool new-version 15
    # Unfortunately this edits Info.plist directly.
    #xcrun agvtool new-marketing-version 0.4.5
-   cat App.xcodeproj/project.pbxproj | sed "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 0.4.5;/g" > temp
-   mv temp App.xcodeproj/project.pbxproj
-   cd -
    ```
 
 5. Open the project in Xcode:
@@ -369,28 +364,25 @@ Prerequisites: macOS with Xcode installed
 
 6. Use Xcode to build and run on simulator or device.
 
+  * Select Product -> Destination with some Simulator version. Then click the run arrow.
+
 7. Release
 
-  * Under "General" renamed a bunch of things to "Time Safari"
+  * Someday: Under "General" we want to rename a bunch of things to "Time Safari"
-  * Choose Product -> Destination -> Build Any iOS
+  * Choose Product -> Destination -> Any iOS Device
   * Choose Product -> Archive
-    * This will trigger a build and take time, needing user's "login" keychain password which is just their login password, repeatedly.
+    * This will trigger a build and take time, needing user's "login" keychain password (user's login password), repeatedly.
     * If it fails with `building for 'iOS', but linking in dylib (.../.pkgx/zlib.net/v1.3.0/lib/libz.1.3.dylib) built for 'macOS'` then run XCode outside that terminal (ie. not with `npx cap open ios`).
     * Click Distribute -> App Store Connect
   * In AppStoreConnect, add the build to the distribution: remove the current build with the "-" when you hover over it, then "Add Build" with the new build.
+    * May have to go to App Review, click Submission, then hover over the build and click "-".
     * 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".
 
-#### First-time iOS Configuration
-
-- Generate certificates inside XCode.
-
-- Right-click on App and under Signing & Capabilities set the Team.
-
 ### Android Build
 
-Prerequisites: Android Studio with SDK installed
+Prerequisites: Android Studio with Java SDK installed
 
 1. Build the web assets:
 
@@ -412,7 +404,7 @@ Prerequisites: Android Studio with SDK installed
    npx capacitor-assets generate --android
    ```
 
-4. Bump version to match iOS: android/app/build.gradle
+4. Bump version to match iOS & package.json: android/app/build.gradle
 
 5. Open the project in Android Studio:
 
@@ -429,7 +421,6 @@ Prerequisites: Android Studio with SDK installed
    ./gradlew clean
    ./gradlew build -Dlint.baselines.continue=true
    cd -
-   npx cap run android
    ```
 
 ... or, to create the `aab` file, `bundle` instead of `build`:
@@ -445,7 +436,9 @@ Prerequisites: Android Studio with SDK installed
   * Then `bundleRelease`:
 
    ```bash
+   cd android
    ./gradlew bundleRelease -Dlint.baselines.continue=true
+   cd -
    ```
 
   ... and find your `aab` file at app/build/outputs/bundle/release
@@ -458,8 +451,10 @@ At play.google.com/console:
 - Hit "Next".
 - Save, go to "Publishing Overview" as prompted, and click "Send changes for review".
 
+- 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.
 
-## First-time Android Configuration for deep links
+
+## Android Configuration for deep links
 
 You must add the following intent filter to the `android/app/src/main/AndroidManifest.xml` file:
 
@@ -470,4 +465,15 @@ You must add the following intent filter to the `android/app/src/main/AndroidMan
                   <category android:name="android.intent.category.BROWSABLE" />
                   <data android:scheme="timesafari" />
                </intent-filter>
-   ```
+   ```
+
+... though when we tried that most recently it failed to 'build' the APK with: http(s) scheme and host attribute are missing, but are required for Android App Links [AppLinkUrlError]
+
+## Forks
+
+If you have forked this to make your own app, you'll want to customize the iOS & Android files. You can either edit existing ones, or you can remove the `ios` and `android` directories and regenerate them before the `npx cap sync` step in each setup.
+
+   ```bash
+   npx cap add android
+   npx cap add ios
+   ```

doc/DEEP_LINKS.md

@@ -100,6 +100,7 @@ try {
 - `src/interfaces/deepLinks.ts`: Type definitions and validation schemas
 - `src/services/deepLinks.ts`: Deep link processing service
 - `src/main.capacitor.ts`: Capacitor integration
+- `src/views/DeepLinkRedirectView.vue`: Page to handle links to both mobile and web
 
 ## Type Safety Examples
 

doc/database-migration-guide.md

@@ -0,0 +1,321 @@
+# Database Migration Guide
+
+## Overview
+
+The Database Migration feature allows you to compare and migrate data between Dexie (IndexedDB) and SQLite databases in the TimeSafari application. This is particularly useful during the transition from the old Dexie-based storage system to the new SQLite-based system.
+
+## Features
+
+### 1. Database Comparison
+
+- Compare data between Dexie and SQLite databases
+- View detailed differences in contacts and settings
+- Identify added, modified, and missing records
+- Export comparison results for analysis
+
+### 2. Data Migration
+
+- Migrate contacts from Dexie to SQLite
+- Migrate settings from Dexie to SQLite
+- Option to overwrite existing records or skip them
+- Comprehensive error handling and reporting
+
+### 3. User Interface
+
+- Modern, responsive UI built with Tailwind CSS
+- Real-time loading states and progress indicators
+- Clear success and error messaging
+- Export functionality for comparison data
+
+## Database Migration Status
+
+**Current Status**: The application is undergoing a migration from Dexie (IndexedDB) to SQLite using absurd-sql. This migration is in **Phase 2** with a well-defined migration fence in place.
+
+### Migration Progress
+- ✅ **SQLite Database Service**: Fully implemented with absurd-sql
+- ✅ **Platform Service Layer**: Unified database interface across platforms
+- ✅ **Settings Migration**: Core user settings transferred
+- ✅ **Account Migration**: Identity and key management
+- 🔄 **Contact Migration**: User contact data (via import interface)
+- 📋 **Code Cleanup**: Remove unused Dexie imports
+
+### Migration Fence
+The migration is controlled by a **migration fence** that separates legacy Dexie code from the new SQLite implementation. See [Migration Fence Definition](doc/migration-fence-definition.md) for complete details.
+
+**Key Points**:
+- Legacy Dexie database is disabled by default (`USE_DEXIE_DB = false`)
+- All database operations go through `PlatformService`
+- Migration tools provide controlled access to both databases
+- Clear separation between legacy and new code
+
+### Migration Documentation
+- [Migration Guide](doc/migration-to-wa-sqlite.md) - Complete migration process
+- [Migration Fence Definition](doc/migration-fence-definition.md) - Fence boundaries and rules
+- [Database Migration Guide](doc/database-migration-guide.md) - User-facing migration tools
+
+## Prerequisites
+
+### Enable Dexie Database
+
+Before using the migration features, you must enable the Dexie database by setting:
+
+```typescript
+// In constants/app.ts
+export const USE_DEXIE_DB = true;
+```
+
+**Note**: This should only be enabled temporarily during migration. Remember to set it back to `false` after migration is complete.
+
+## Accessing the Migration Interface
+
+1. Navigate to the **Account** page in the TimeSafari app
+2. Scroll down to find the **Database Migration** link
+3. Click the link to open the migration interface
+
+## Using the Migration Interface
+
+### Step 1: Compare Databases
+
+1. Click the **"Compare Databases"** button
+2. The system will retrieve data from both Dexie and SQLite databases
+3. Review the comparison results showing:
+   - Summary counts for each database
+   - Detailed differences (added, modified, missing records)
+   - Specific records that need attention
+
+### Step 2: Review Differences
+
+The comparison results are displayed in several sections:
+
+#### Summary Cards
+
+- **Dexie Contacts**: Number of contacts in Dexie database
+- **SQLite Contacts**: Number of contacts in SQLite database
+- **Dexie Settings**: Number of settings in Dexie database
+- **SQLite Settings**: Number of settings in SQLite database
+
+#### Contact Differences
+
+- **Added**: Contacts in Dexie but not in SQLite
+- **Modified**: Contacts that differ between databases
+- **Missing**: Contacts in SQLite but not in Dexie
+
+#### Settings Differences
+
+- **Added**: Settings in Dexie but not in SQLite
+- **Modified**: Settings that differ between databases
+- **Missing**: Settings in SQLite but not in Dexie
+
+### Step 3: Configure Migration Options
+
+Before migrating data, configure the migration options:
+
+- **Overwrite existing records**: When enabled, existing records in SQLite will be updated with data from Dexie. When disabled, existing records will be skipped.
+
+### Step 4: Migrate Data
+
+#### Migrate Contacts
+
+1. Click the **"Migrate Contacts"** button
+2. The system will transfer contacts from Dexie to SQLite
+3. Review the migration results showing:
+   - Number of contacts successfully migrated
+   - Any warnings or errors encountered
+
+#### Migrate Settings
+
+1. Click the **"Migrate Settings"** button
+2. The system will transfer settings from Dexie to SQLite
+3. Review the migration results showing:
+   - Number of settings successfully migrated
+   - Any warnings or errors encountered
+
+### Step 5: Export Comparison (Optional)
+
+1. Click the **"Export Comparison"** button
+2. A JSON file will be downloaded containing the complete comparison data
+3. This file can be used for analysis or backup purposes
+
+## Migration Process Details
+
+### Contact Migration
+
+The contact migration process:
+
+1. **Retrieves** all contacts from Dexie database
+2. **Checks** for existing contacts in SQLite by DID
+3. **Inserts** new contacts or **updates** existing ones (if overwrite is enabled)
+4. **Handles** complex fields like `contactMethods` (JSON arrays)
+5. **Reports** success/failure for each contact
+
+### Settings Migration
+
+The settings migration process:
+
+1. **Retrieves** all settings from Dexie database
+2. **Focuses** on key user-facing settings:
+   - `firstName`
+   - `isRegistered`
+   - `profileImageUrl`
+   - `showShortcutBvc`
+   - `searchBoxes`
+3. **Preserves** other settings in SQLite
+4. **Reports** success/failure for each setting
+
+## Error Handling
+
+### Common Issues
+
+#### Dexie Database Not Enabled
+
+**Error**: "Dexie database is not enabled"
+**Solution**: Set `USE_DEXIE_DB = true` in `constants/app.ts`
+
+#### Database Connection Issues
+
+**Error**: "Failed to retrieve Dexie contacts"
+**Solution**: Check that the Dexie database is properly initialized and accessible
+
+#### SQLite Query Errors
+
+**Error**: "Failed to retrieve SQLite contacts"
+**Solution**: Verify that the SQLite database is properly set up and the platform service is working
+
+#### Migration Failures
+
+**Error**: "Migration failed: [specific error]"
+**Solution**: Review the error details and check data integrity in both databases
+
+### Error Recovery
+
+1. **Review** the error messages carefully
+2. **Check** the browser console for additional details
+3. **Verify** database connectivity and permissions
+4. **Retry** the operation if appropriate
+5. **Export** comparison data for manual review if needed
+
+## Best Practices
+
+### Before Migration
+
+1. **Backup** your data if possible
+2. **Test** the migration on a small dataset first
+3. **Verify** that both databases are accessible
+4. **Review** the comparison results before migrating
+
+### During Migration
+
+1. **Don't** interrupt the migration process
+2. **Monitor** the progress and error messages
+3. **Note** any warnings or skipped records
+4. **Export** comparison data for reference
+
+### After Migration
+
+1. **Verify** that data was migrated correctly
+2. **Test** the application functionality
+3. **Disable** Dexie database (`USE_DEXIE_DB = false`)
+4. **Clean up** any temporary files or exports
+
+## Technical Details
+
+### Database Schema
+
+The migration handles the following data structures:
+
+#### Contacts Table
+
+```typescript
+interface Contact {
+  did: string;                    // Decentralized Identifier
+  name: string;                   // Contact name
+  contactMethods: ContactMethod[]; // Array of contact methods
+  nextPubKeyHashB64: string;      // Next public key hash
+  notes: string;                  // Contact notes
+  profileImageUrl: string;        // Profile image URL
+  publicKeyBase64: string;        // Public key in base64
+  seesMe: boolean;                // Visibility flag
+  registered: boolean;            // Registration status
+}
+```
+
+#### Settings Table
+
+```typescript
+interface Settings {
+  id: number;                     // Settings ID
+  accountDid: string;             // Account DID
+  activeDid: string;              // Active DID
+  firstName: string;              // User's first name
+  isRegistered: boolean;          // Registration status
+  profileImageUrl: string;        // Profile image URL
+  showShortcutBvc: boolean;       // UI preference
+  searchBoxes: any[];             // Search configuration
+  // ... other fields
+}
+```
+
+### Migration Logic
+
+The migration service uses sophisticated comparison logic:
+
+1. **Primary Key Matching**: Uses DID for contacts, ID for settings
+2. **Deep Comparison**: Compares all fields including complex objects
+3. **JSON Handling**: Properly handles JSON fields like `contactMethods` and `searchBoxes`
+4. **Conflict Resolution**: Provides options for handling existing records
+
+### Performance Considerations
+
+- **Batch Processing**: Processes records one by one for reliability
+- **Error Isolation**: Individual record failures don't stop the entire migration
+- **Memory Management**: Handles large datasets efficiently
+- **Progress Reporting**: Provides real-time feedback during migration
+
+## Troubleshooting
+
+### Migration Stuck
+
+If the migration appears to be stuck:
+
+1. **Check** the browser console for errors
+2. **Refresh** the page and try again
+3. **Verify** database connectivity
+4. **Check** for large datasets that might take time
+
+### Incomplete Migration
+
+If migration doesn't complete:
+
+1. **Review** error messages
+2. **Check** data integrity in both databases
+3. **Export** comparison data for manual review
+4. **Consider** migrating in smaller batches
+
+### Data Inconsistencies
+
+If you notice data inconsistencies:
+
+1. **Export** comparison data
+2. **Review** the differences carefully
+3. **Manually** verify critical records
+4. **Consider** selective migration of specific records
+
+## Support
+
+For issues with the Database Migration feature:
+
+1. **Check** this documentation first
+2. **Review** the browser console for error details
+3. **Export** comparison data for analysis
+4. **Contact** the development team with specific error details
+
+## Security Considerations
+
+- **Data Privacy**: Migration data is processed locally and not sent to external servers
+- **Access Control**: Only users with access to the account can perform migration
+- **Data Integrity**: Migration preserves data integrity and handles conflicts gracefully
+- **Audit Trail**: Export functionality provides an audit trail of migration operations
+
+---
+
+**Note**: This migration tool is designed for the transition period between database systems. Once migration is complete and verified, the Dexie database should be disabled to avoid confusion and potential data conflicts.

doc/dexie-to-sqlite-mapping.md

@@ -3,6 +3,7 @@
 ## Schema Mapping
 
 ### Current Dexie Schema
+
 ```typescript
 // Current Dexie schema
 const db = new Dexie('TimeSafariDB');
@@ -15,6 +16,7 @@ db.version(1).stores({
 ```
 
 ### New SQLite Schema
+
 ```sql
 -- New SQLite schema
 CREATE TABLE accounts (
@@ -50,6 +52,7 @@ CREATE INDEX idx_settings_updated_at ON settings(updated_at);
 ### 1. Account Operations
 
 #### Get Account by DID
+
 ```typescript
 // Dexie
 const account = await db.accounts.get(did);
@@ -62,6 +65,7 @@ const account = result[0]?.values[0];
 ```
 
 #### Get All Accounts
+
 ```typescript
 // Dexie
 const accounts = await db.accounts.toArray();
@@ -74,6 +78,7 @@ const accounts = result[0]?.values || [];
 ```
 
 #### Add Account
+
 ```typescript
 // Dexie
 await db.accounts.add({
@@ -91,6 +96,7 @@ await db.run(`
 ```
 
 #### Update Account
+
 ```typescript
 // Dexie
 await db.accounts.update(did, {
@@ -100,7 +106,7 @@ await db.accounts.update(did, {
 
 // absurd-sql
 await db.run(`
-  UPDATE accounts 
+  UPDATE accounts
   SET public_key_hex = ?, updated_at = ?
   WHERE did = ?
 `, [publicKeyHex, Date.now(), did]);
@@ -109,6 +115,7 @@ await db.run(`
 ### 2. Settings Operations
 
 #### Get Setting
+
 ```typescript
 // Dexie
 const setting = await db.settings.get(key);
@@ -121,6 +128,7 @@ const setting = result[0]?.values[0];
 ```
 
 #### Set Setting
+
 ```typescript
 // Dexie
 await db.settings.put({
@@ -142,6 +150,7 @@ await db.run(`
 ### 3. Contact Operations
 
 #### Get Contacts by Account
+
 ```typescript
 // Dexie
 const contacts = await db.contacts
@@ -151,7 +160,7 @@ const contacts = await db.contacts
 
 // absurd-sql
 const result = await db.exec(`
-  SELECT * FROM contacts 
+  SELECT * FROM contacts
   WHERE did = ?
   ORDER BY created_at DESC
 `, [accountDid]);
@@ -159,6 +168,7 @@ const contacts = result[0]?.values || [];
 ```
 
 #### Add Contact
+
 ```typescript
 // Dexie
 await db.contacts.add({
@@ -179,6 +189,7 @@ await db.run(`
 ## Transaction Mapping
 
 ### Batch Operations
+
 ```typescript
 // Dexie
 await db.transaction('rw', [db.accounts, db.contacts], async () => {
@@ -210,10 +221,11 @@ try {
 ## Migration Helper Functions
 
 ### 1. Data Export (Dexie to JSON)
+
 ```typescript
 async function exportDexieData(): Promise<MigrationData> {
   const db = new Dexie('TimeSafariDB');
-  
+
   return {
     accounts: await db.accounts.toArray(),
     settings: await db.settings.toArray(),
@@ -228,6 +240,7 @@ async function exportDexieData(): Promise<MigrationData> {
 ```
 
 ### 2. Data Import (JSON to absurd-sql)
+
 ```typescript
 async function importToAbsurdSql(data: MigrationData): Promise<void> {
   await db.exec('BEGIN TRANSACTION;');
@@ -239,7 +252,7 @@ async function importToAbsurdSql(data: MigrationData): Promise<void> {
         VALUES (?, ?, ?, ?)
       `, [account.did, account.publicKeyHex, account.createdAt, account.updatedAt]);
     }
-    
+
     // Import settings
     for (const setting of data.settings) {
       await db.run(`
@@ -247,7 +260,7 @@ async function importToAbsurdSql(data: MigrationData): Promise<void> {
         VALUES (?, ?, ?)
       `, [setting.key, setting.value, setting.updatedAt]);
     }
-    
+
     // Import contacts
     for (const contact of data.contacts) {
       await db.run(`
@@ -264,6 +277,7 @@ async function importToAbsurdSql(data: MigrationData): Promise<void> {
 ```
 
 ### 3. Verification
+
 ```typescript
 async function verifyMigration(dexieData: MigrationData): Promise<boolean> {
   // Verify account count
@@ -272,21 +286,21 @@ async function verifyMigration(dexieData: MigrationData): Promise<boolean> {
   if (accountCount !== dexieData.accounts.length) {
     return false;
   }
-  
+
   // Verify settings count
   const settingsResult = await db.exec('SELECT COUNT(*) as count FROM settings');
   const settingsCount = settingsResult[0].values[0][0];
   if (settingsCount !== dexieData.settings.length) {
     return false;
   }
-  
+
   // Verify contacts count
   const contactsResult = await db.exec('SELECT COUNT(*) as count FROM contacts');
   const contactsCount = contactsResult[0].values[0][0];
   if (contactsCount !== dexieData.contacts.length) {
     return false;
   }
-  
+
   // Verify data integrity
   for (const account of dexieData.accounts) {
     const result = await db.exec(
@@ -294,12 +308,12 @@ async function verifyMigration(dexieData: MigrationData): Promise<boolean> {
       [account.did]
     );
     const migratedAccount = result[0]?.values[0];
-    if (!migratedAccount || 
+    if (!migratedAccount ||
         migratedAccount[1] !== account.publicKeyHex) { // public_key_hex is second column
       return false;
     }
   }
-  
+
   return true;
 }
 ```
@@ -307,18 +321,21 @@ async function verifyMigration(dexieData: MigrationData): Promise<boolean> {
 ## Performance Considerations
 
 ### 1. Indexing
+
 - Dexie automatically creates indexes based on the schema
 - absurd-sql requires explicit index creation
 - Added indexes for frequently queried fields
 - Use `PRAGMA journal_mode=MEMORY;` for better performance
 
 ### 2. Batch Operations
+
 - Dexie has built-in bulk operations
 - absurd-sql uses transactions for batch operations
 - Consider chunking large datasets
 - Use prepared statements for repeated queries
 
 ### 3. Query Optimization
+
 - Dexie uses IndexedDB's native indexing
 - absurd-sql requires explicit query optimization
 - Use prepared statements for repeated queries
@@ -327,6 +344,7 @@ async function verifyMigration(dexieData: MigrationData): Promise<boolean> {
 ## Error Handling
 
 ### 1. Common Errors
+
 ```typescript
 // Dexie errors
 try {
@@ -351,6 +369,7 @@ try {
 ```
 
 ### 2. Transaction Recovery
+
 ```typescript
 // Dexie transaction
 try {
@@ -396,4 +415,4 @@ try {
    - Remove Dexie database
    - Clear IndexedDB storage
    - Update application code
-   - Remove old dependencies 
+   - Remove old dependencies

doc/migration-fence-definition.md

@@ -0,0 +1,272 @@
+# Migration Fence Definition: Dexie to SQLite
+
+## Overview
+
+This document defines the **migration fence** - the boundary between the legacy Dexie (IndexedDB) storage system and the new SQLite-based storage system in TimeSafari. The fence ensures controlled migration while maintaining data integrity and application stability.
+
+## Current Migration Status
+
+### ✅ Completed Components
+- **SQLite Database Service**: Fully implemented with absurd-sql
+- **Platform Service Layer**: Unified database interface across platforms
+- **Migration Tools**: Data comparison and transfer utilities
+- **Schema Migration**: Complete table structure migration
+- **Data Export/Import**: Backup and restore functionality
+
+### 🔄 Active Migration Components
+- **Settings Migration**: Core user settings transferred
+- **Account Migration**: Identity and key management
+- **Contact Migration**: User contact data (via import interface)
+
+### ❌ Legacy Components (Fence Boundary)
+- **Dexie Database**: Legacy IndexedDB storage (disabled by default)
+- **Dexie-Specific Code**: Direct database access patterns
+- **Legacy Migration Paths**: Old data transfer methods
+
+## Migration Fence Definition
+
+### 1. Configuration Boundary
+
+```typescript
+// src/constants/app.ts
+export const USE_DEXIE_DB = false; // FENCE: Controls legacy database access
+```
+
+**Fence Rule**: When `USE_DEXIE_DB = false`:
+- All new data operations use SQLite
+- Legacy Dexie database is not initialized
+- Migration tools are the only path to legacy data
+
+**Fence Rule**: When `USE_DEXIE_DB = true`:
+- Legacy database is available for migration
+- Dual-write operations may be enabled
+- Migration tools can access both databases
+
+### 2. Service Layer Boundary
+
+```typescript
+// src/services/PlatformServiceFactory.ts
+export class PlatformServiceFactory {
+  public static getInstance(): PlatformService {
+    // FENCE: All database operations go through platform service
+    // No direct Dexie access outside migration tools
+  }
+}
+```
+
+**Fence Rule**: All database operations must use:
+- `PlatformService.dbQuery()` for read operations
+- `PlatformService.dbExec()` for write operations
+- No direct `db.` or `accountsDBPromise` access in application code
+
+### 3. Data Access Patterns
+
+#### ✅ Allowed (Inside Fence)
+```typescript
+// Use platform service for all database operations
+const platformService = PlatformServiceFactory.getInstance();
+const contacts = await platformService.dbQuery(
+  "SELECT * FROM contacts WHERE did = ?",
+  [accountDid]
+);
+```
+
+#### ❌ Forbidden (Outside Fence)
+```typescript
+// Direct Dexie access (legacy pattern)
+const contacts = await db.contacts.where('did').equals(accountDid).toArray();
+
+// Direct database reference
+const result = await accountsDBPromise;
+```
+
+### 4. Migration Tool Boundary
+
+```typescript
+// src/services/indexedDBMigrationService.ts
+// FENCE: Only migration tools can access both databases
+export async function compareDatabases(): Promise<DataComparison> {
+  // This is the ONLY place where both databases are accessed
+}
+```
+
+**Fence Rule**: Migration tools are the exclusive interface between:
+- Legacy Dexie database
+- New SQLite database
+- Data comparison and transfer operations
+
+## Migration Fence Guidelines
+
+### 1. Code Development Rules
+
+#### New Feature Development
+- **Always** use `PlatformService` for database operations
+- **Never** import or reference Dexie directly
+- **Always** test with `USE_DEXIE_DB = false`
+
+#### Legacy Code Maintenance
+- **Only** modify Dexie code for migration purposes
+- **Always** add migration tests for schema changes
+- **Never** add new Dexie-specific features
+
+### 2. Data Integrity Rules
+
+#### Migration Safety
+- **Always** create backups before migration
+- **Always** verify data integrity after migration
+- **Never** delete legacy data until verified
+
+#### Rollback Strategy
+- **Always** maintain ability to rollback to Dexie
+- **Always** preserve migration logs
+- **Never** assume migration is irreversible
+
+### 3. Testing Requirements
+
+#### Migration Testing
+```typescript
+// Required test pattern for migration
+describe('Database Migration', () => {
+  it('should migrate data without loss', async () => {
+    // 1. Enable Dexie
+    // 2. Create test data
+    // 3. Run migration
+    // 4. Verify data integrity
+    // 5. Disable Dexie
+  });
+});
+```
+
+#### Application Testing
+```typescript
+// Required test pattern for application features
+describe('Feature with Database', () => {
+  it('should work with SQLite only', async () => {
+    // Test with USE_DEXIE_DB = false
+    // Verify all operations use PlatformService
+  });
+});
+```
+
+## Migration Fence Enforcement
+
+### 1. Static Analysis
+
+#### ESLint Rules
+```json
+{
+  "rules": {
+    "no-restricted-imports": [
+      "error",
+      {
+        "patterns": [
+          {
+            "group": ["../db/index"],
+            "message": "Use PlatformService instead of direct Dexie access"
+          }
+        ]
+      }
+    ]
+  }
+}
+```
+
+#### TypeScript Rules
+```json
+{
+  "compilerOptions": {
+    "strict": true,
+    "noImplicitAny": true
+  }
+}
+```
+
+### 2. Runtime Checks
+
+#### Development Mode Validation
+```typescript
+// Development-only fence validation
+if (import.meta.env.DEV && USE_DEXIE_DB) {
+  console.warn('⚠️ Dexie is enabled - migration mode active');
+}
+```
+
+#### Production Safety
+```typescript
+// Production fence enforcement
+if (import.meta.env.PROD && USE_DEXIE_DB) {
+  throw new Error('Dexie cannot be enabled in production');
+}
+```
+
+## Migration Fence Timeline
+
+### Phase 1: Fence Establishment ✅
+- [x] Define migration fence boundaries
+- [x] Implement PlatformService layer
+- [x] Create migration tools
+- [x] Set `USE_DEXIE_DB = false` by default
+
+### Phase 2: Data Migration 🔄
+- [x] Migrate core settings
+- [x] Migrate account data
+- [ ] Complete contact migration
+- [ ] Verify all data integrity
+
+### Phase 3: Code Cleanup 📋
+- [ ] Remove unused Dexie imports
+- [ ] Clean up legacy database code
+- [ ] Update all documentation
+- [ ] Remove migration tools
+
+### Phase 4: Fence Removal 🎯
+- [ ] Remove `USE_DEXIE_DB` constant
+- [ ] Remove Dexie dependencies
+- [ ] Remove migration service
+- [ ] Finalize SQLite-only architecture
+
+## Security Considerations
+
+### 1. Data Protection
+- **Encryption**: Maintain encryption standards across migration
+- **Access Control**: Preserve user privacy during migration
+- **Audit Trail**: Log all migration operations
+
+### 2. Error Handling
+- **Graceful Degradation**: Handle migration failures gracefully
+- **User Communication**: Clear messaging about migration status
+- **Recovery Options**: Provide rollback mechanisms
+
+## Performance Considerations
+
+### 1. Migration Performance
+- **Batch Operations**: Use transactions for bulk data transfer
+- **Progress Indicators**: Show migration progress to users
+- **Background Processing**: Non-blocking migration operations
+
+### 2. Application Performance
+- **Query Optimization**: Optimize SQLite queries for performance
+- **Indexing Strategy**: Maintain proper database indexes
+- **Memory Management**: Efficient memory usage during migration
+
+## Documentation Requirements
+
+### 1. Code Documentation
+- **Migration Fence Comments**: Document fence boundaries in code
+- **API Documentation**: Update all database API documentation
+- **Migration Guides**: Comprehensive migration documentation
+
+### 2. User Documentation
+- **Migration Instructions**: Clear user migration steps
+- **Troubleshooting**: Common migration issues and solutions
+- **Rollback Instructions**: How to revert if needed
+
+## Conclusion
+
+The migration fence provides a controlled boundary between legacy and new database systems, ensuring:
+- **Data Integrity**: No data loss during migration
+- **Application Stability**: Consistent behavior across platforms
+- **Development Clarity**: Clear guidelines for code development
+- **Migration Safety**: Controlled and reversible migration process
+
+This fence will remain in place until all data is successfully migrated and verified, at which point the legacy system can be safely removed. 

doc/migration-security-checklist.md

@@ -0,0 +1,355 @@
+# Database Migration Security Audit Checklist
+
+## Overview
+
+This document provides a comprehensive security audit checklist for the Dexie to SQLite migration in TimeSafari. The checklist ensures that data protection, privacy, and security are maintained throughout the migration process.
+
+## Pre-Migration Security Assessment
+
+### 1. Data Classification and Sensitivity
+
+- [ ] **Data Inventory**
+  - [ ] Identify all sensitive data types (DIDs, private keys, personal information)
+  - [ ] Document data retention requirements
+  - [ ] Map data relationships and dependencies
+  - [ ] Assess data sensitivity levels (public, internal, confidential, restricted)
+
+- [ ] **Encryption Assessment**
+  - [ ] Verify current encryption methods for sensitive data
+  - [ ] Document encryption keys and their management
+  - [ ] Assess encryption strength and compliance
+  - [ ] Plan encryption migration strategy
+
+### 2. Access Control Review
+
+- [ ] **User Access Rights**
+  - [ ] Audit current user permissions and roles
+  - [ ] Document access control mechanisms
+  - [ ] Verify principle of least privilege
+  - [ ] Plan access control migration
+
+- [ ] **System Access**
+  - [ ] Review database access patterns
+  - [ ] Document authentication mechanisms
+  - [ ] Assess session management
+  - [ ] Plan authentication migration
+
+### 3. Compliance Requirements
+
+- [ ] **Regulatory Compliance**
+  - [ ] Identify applicable regulations (GDPR, CCPA, etc.)
+  - [ ] Document data processing requirements
+  - [ ] Assess privacy impact
+  - [ ] Plan compliance verification
+
+- [ ] **Industry Standards**
+  - [ ] Review security standards compliance
+  - [ ] Document security controls
+  - [ ] Assess audit requirements
+  - [ ] Plan standards compliance
+
+## Migration Security Controls
+
+### 1. Data Protection During Migration
+
+- [ ] **Encryption in Transit**
+  - [ ] Verify all data transfers are encrypted
+  - [ ] Use secure communication protocols (TLS 1.3+)
+  - [ ] Implement secure API endpoints
+  - [ ] Monitor encryption status
+
+- [ ] **Encryption at Rest**
+  - [ ] Maintain encryption for stored data
+  - [ ] Verify encryption key management
+  - [ ] Test encryption/decryption processes
+  - [ ] Document encryption procedures
+
+### 2. Access Control During Migration
+
+- [ ] **Authentication**
+  - [ ] Maintain user authentication during migration
+  - [ ] Verify session management
+  - [ ] Implement secure token handling
+  - [ ] Monitor authentication events
+
+- [ ] **Authorization**
+  - [ ] Preserve user permissions during migration
+  - [ ] Verify role-based access control
+  - [ ] Implement audit logging
+  - [ ] Monitor access patterns
+
+### 3. Data Integrity
+
+- [ ] **Data Validation**
+  - [ ] Implement input validation for all data
+  - [ ] Verify data format consistency
+  - [ ] Test data transformation processes
+  - [ ] Document validation rules
+
+- [ ] **Data Verification**
+  - [ ] Implement checksums for data integrity
+  - [ ] Verify data completeness after migration
+  - [ ] Test data consistency checks
+  - [ ] Document verification procedures
+
+## Migration Process Security
+
+### 1. Backup Security
+
+- [ ] **Backup Creation**
+  - [ ] Create encrypted backups before migration
+  - [ ] Verify backup integrity
+  - [ ] Store backups securely
+  - [ ] Test backup restoration
+
+- [ ] **Backup Access**
+  - [ ] Limit backup access to authorized personnel
+  - [ ] Implement backup access logging
+  - [ ] Verify backup encryption
+  - [ ] Document backup procedures
+
+### 2. Migration Tool Security
+
+- [ ] **Tool Authentication**
+  - [ ] Implement secure authentication for migration tools
+  - [ ] Verify tool access controls
+  - [ ] Monitor tool usage
+  - [ ] Document tool security
+
+- [ ] **Tool Validation**
+  - [ ] Verify migration tool integrity
+  - [ ] Test tool security features
+  - [ ] Validate tool outputs
+  - [ ] Document tool validation
+
+### 3. Error Handling
+
+- [ ] **Error Security**
+  - [ ] Implement secure error handling
+  - [ ] Avoid information disclosure in errors
+  - [ ] Log security-relevant errors
+  - [ ] Document error procedures
+
+- [ ] **Recovery Security**
+  - [ ] Implement secure recovery procedures
+  - [ ] Verify recovery data protection
+  - [ ] Test recovery processes
+  - [ ] Document recovery security
+
+## Post-Migration Security
+
+### 1. Data Verification
+
+- [ ] **Data Completeness**
+  - [ ] Verify all data was migrated successfully
+  - [ ] Check for data corruption
+  - [ ] Validate data relationships
+  - [ ] Document verification results
+
+- [ ] **Data Accuracy**
+  - [ ] Verify data accuracy after migration
+  - [ ] Test data consistency
+  - [ ] Validate data integrity
+  - [ ] Document accuracy checks
+
+### 2. Access Control Verification
+
+- [ ] **User Access**
+  - [ ] Verify user access rights after migration
+  - [ ] Test authentication mechanisms
+  - [ ] Validate authorization rules
+  - [ ] Document access verification
+
+- [ ] **System Access**
+  - [ ] Verify system access controls
+  - [ ] Test API security
+  - [ ] Validate session management
+  - [ ] Document system security
+
+### 3. Security Testing
+
+- [ ] **Penetration Testing**
+  - [ ] Conduct security penetration testing
+  - [ ] Test for common vulnerabilities
+  - [ ] Verify security controls
+  - [ ] Document test results
+
+- [ ] **Vulnerability Assessment**
+  - [ ] Scan for security vulnerabilities
+  - [ ] Assess security posture
+  - [ ] Identify security gaps
+  - [ ] Document assessment results
+
+## Monitoring and Logging
+
+### 1. Security Monitoring
+
+- [ ] **Access Monitoring**
+  - [ ] Monitor database access patterns
+  - [ ] Track user authentication events
+  - [ ] Monitor system access
+  - [ ] Document monitoring procedures
+
+- [ ] **Data Monitoring**
+  - [ ] Monitor data access patterns
+  - [ ] Track data modification events
+  - [ ] Monitor data integrity
+  - [ ] Document data monitoring
+
+### 2. Security Logging
+
+- [ ] **Audit Logging**
+  - [ ] Implement comprehensive audit logging
+  - [ ] Log all security-relevant events
+  - [ ] Secure log storage and access
+  - [ ] Document logging procedures
+
+- [ ] **Log Analysis**
+  - [ ] Implement log analysis tools
+  - [ ] Monitor for security incidents
+  - [ ] Analyze security trends
+  - [ ] Document analysis procedures
+
+## Incident Response
+
+### 1. Security Incident Planning
+
+- [ ] **Incident Response Plan**
+  - [ ] Develop security incident response plan
+  - [ ] Define incident response procedures
+  - [ ] Train incident response team
+  - [ ] Document response procedures
+
+- [ ] **Incident Detection**
+  - [ ] Implement incident detection mechanisms
+  - [ ] Monitor for security incidents
+  - [ ] Establish incident reporting procedures
+  - [ ] Document detection procedures
+
+### 2. Recovery Procedures
+
+- [ ] **Data Recovery**
+  - [ ] Develop data recovery procedures
+  - [ ] Test recovery processes
+  - [ ] Verify recovery data integrity
+  - [ ] Document recovery procedures
+
+- [ ] **System Recovery**
+  - [ ] Develop system recovery procedures
+  - [ ] Test system recovery
+  - [ ] Verify system security after recovery
+  - [ ] Document recovery procedures
+
+## Compliance Verification
+
+### 1. Regulatory Compliance
+
+- [ ] **Privacy Compliance**
+  - [ ] Verify GDPR compliance
+  - [ ] Check CCPA compliance
+  - [ ] Assess other privacy regulations
+  - [ ] Document compliance status
+
+- [ ] **Security Compliance**
+  - [ ] Verify security standard compliance
+  - [ ] Check industry requirements
+  - [ ] Assess security certifications
+  - [ ] Document compliance status
+
+### 2. Audit Requirements
+
+- [ ] **Audit Trail**
+  - [ ] Maintain comprehensive audit trail
+  - [ ] Verify audit log integrity
+  - [ ] Test audit log accessibility
+  - [ ] Document audit procedures
+
+- [ ] **Audit Reporting**
+  - [ ] Generate audit reports
+  - [ ] Verify report accuracy
+  - [ ] Distribute reports securely
+  - [ ] Document reporting procedures
+
+## Documentation and Training
+
+### 1. Security Documentation
+
+- [ ] **Security Procedures**
+  - [ ] Document security procedures
+  - [ ] Update security policies
+  - [ ] Create security guidelines
+  - [ ] Maintain documentation
+
+- [ ] **Security Training**
+  - [ ] Develop security training materials
+  - [ ] Train staff on security procedures
+  - [ ] Verify training effectiveness
+  - [ ] Document training procedures
+
+### 2. Ongoing Security
+
+- [ ] **Security Maintenance**
+  - [ ] Establish security maintenance procedures
+  - [ ] Schedule security updates
+  - [ ] Monitor security trends
+  - [ ] Document maintenance procedures
+
+- [ ] **Security Review**
+  - [ ] Conduct regular security reviews
+  - [ ] Update security controls
+  - [ ] Assess security effectiveness
+  - [ ] Document review procedures
+
+## Risk Assessment
+
+### 1. Risk Identification
+
+- [ ] **Security Risks**
+  - [ ] Identify potential security risks
+  - [ ] Assess risk likelihood and impact
+  - [ ] Prioritize security risks
+  - [ ] Document risk assessment
+
+- [ ] **Mitigation Strategies**
+  - [ ] Develop risk mitigation strategies
+  - [ ] Implement risk controls
+  - [ ] Monitor risk status
+  - [ ] Document mitigation procedures
+
+### 2. Risk Monitoring
+
+- [ ] **Risk Tracking**
+  - [ ] Track identified risks
+  - [ ] Monitor risk status
+  - [ ] Update risk assessments
+  - [ ] Document risk tracking
+
+- [ ] **Risk Reporting**
+  - [ ] Generate risk reports
+  - [ ] Distribute risk information
+  - [ ] Update risk documentation
+  - [ ] Document reporting procedures
+
+## Conclusion
+
+This security audit checklist ensures that the database migration maintains the highest standards of data protection, privacy, and security. Regular review and updates of this checklist are essential to maintain security throughout the migration process and beyond.
+
+### Security Checklist Summary
+
+- [ ] **Pre-Migration Assessment**: Complete
+- [ ] **Migration Controls**: Complete
+- [ ] **Process Security**: Complete
+- [ ] **Post-Migration Verification**: Complete
+- [ ] **Monitoring and Logging**: Complete
+- [ ] **Incident Response**: Complete
+- [ ] **Compliance Verification**: Complete
+- [ ] **Documentation and Training**: Complete
+- [ ] **Risk Assessment**: Complete
+
+**Overall Security Status**: [ ] Secure [ ] Needs Attention [ ] Critical Issues
+
+**Next Review Date**: _______________
+
+**Reviewed By**: _______________
+
+**Approved By**: _______________ 

doc/migration-to-wa-sqlite.md

@@ -4,610 +4,223 @@
 
 This document outlines the migration process from Dexie.js to absurd-sql for the TimeSafari app's storage implementation. The migration aims to provide a consistent SQLite-based storage solution across all platforms while maintaining data integrity and ensuring a smooth transition for users.
 
+**Current Status**: The migration is in **Phase 2** with a well-defined migration fence in place. Core settings and account data have been migrated, with contact migration in progress. **ActiveDid migration has been implemented** to ensure user identity continuity.
+
 ## Migration Goals
 
 1. **Data Integrity**
    - Preserve all existing data
    - Maintain data relationships
    - Ensure data consistency
+   - **Preserve user's active identity**
 
 2. **Performance**
    - Improve query performance
    - Reduce storage overhead
-   - Optimize for platform-specific features
+   - Optimize for platform-specific capabilities
 
-3. **Security**
+3. **User Experience**
-   - Maintain or improve encryption
+   - Seamless transition with no data loss
-   - Preserve access controls
+   - Maintain user's active identity and preferences
-   - Enhance data protection
+   - Preserve application state
 
-4. **User Experience**
+## Migration Architecture
-   - Zero data loss
-   - Minimal downtime
-   - Automatic migration where possible
 
-## Prerequisites
+### Migration Fence
+The migration fence is defined by the `USE_DEXIE_DB` constant in `src/constants/app.ts`:
+- `USE_DEXIE_DB = false` (default): Uses SQLite database
+- `USE_DEXIE_DB = true`: Uses Dexie database (for migration purposes)
 
-1. **Backup Requirements**
+### Migration Order
-   ```typescript
+The migration follows a specific order to maintain data integrity:
-   interface MigrationBackup {
-     timestamp: number;
-     accounts: Account[];
-     settings: Setting[];
-     contacts: Contact[];
-     metadata: {
-       version: string;
-       platform: string;
-       dexieVersion: string;
-     };
-   }
-   ```
 
-2. **Dependencies**
+1. **Accounts** (foundational - contains DIDs)
-   ```json
+2. **Settings** (references accountDid, activeDid)
-   {
+3. **ActiveDid** (depends on accounts and settings) ⭐ **NEW**
-     "@jlongster/sql.js": "^1.8.0",
+4. **Contacts** (independent, but migrated after accounts for consistency)
-     "absurd-sql": "^1.8.0"
-   }
-   ```
 
-3. **Storage Requirements**
+## ActiveDid Migration ⭐ **NEW FEATURE**
-   - Sufficient IndexedDB quota
-   - Available disk space for SQLite
-   - Backup storage space
 
-4. **Platform Support**
+### Problem Solved
-   - Web: Modern browser with IndexedDB support
+Previously, the `activeDid` setting was not migrated from Dexie to SQLite, causing users to lose their active identity after migration.
-   - iOS: iOS 13+ with SQLite support
+
-   - Android: Android 5+ with SQLite support
+### Solution Implemented
-   - Electron: Latest version with SQLite support
+The migration now includes a dedicated step for migrating the `activeDid`:
+
+1. **Detection**: Identifies the `activeDid` from Dexie master settings
+2. **Validation**: Verifies the `activeDid` exists in SQLite accounts
+3. **Migration**: Updates SQLite master settings with the `activeDid`
+4. **Error Handling**: Graceful handling of missing accounts
+
+### Implementation Details
+
+#### New Function: `migrateActiveDid()`
+```typescript
+export async function migrateActiveDid(): Promise<MigrationResult> {
+  // 1. Get Dexie settings to find the activeDid
+  const dexieSettings = await getDexieSettings();
+  const masterSettings = dexieSettings.find(setting => !setting.accountDid);
+  
+  // 2. Verify the activeDid exists in SQLite accounts
+  const accountExists = await platformService.dbQuery(
+    "SELECT did FROM accounts WHERE did = ?",
+    [dexieActiveDid],
+  );
+  
+  // 3. Update SQLite master settings
+  await updateDefaultSettings({ activeDid: dexieActiveDid });
+}
+```
+
+#### Enhanced `migrateSettings()` Function
+The settings migration now includes activeDid handling:
+- Extracts `activeDid` from Dexie master settings
+- Validates account existence in SQLite
+- Updates SQLite master settings with the `activeDid`
+
+#### Updated `migrateAll()` Function
+The complete migration now includes a dedicated step for activeDid:
+```typescript
+// Step 3: Migrate ActiveDid (depends on accounts and settings)
+logger.info("[MigrationService] Step 3: Migrating activeDid...");
+const activeDidResult = await migrateActiveDid();
+```
+
+### Benefits
+- ✅ **User Identity Preservation**: Users maintain their active identity
+- ✅ **Seamless Experience**: No need to manually select identity after migration
+- ✅ **Data Consistency**: Ensures all identity-related settings are preserved
+- ✅ **Error Resilience**: Graceful handling of edge cases
 
 ## Migration Process
 
-### 1. Preparation
+### Phase 1: Preparation ✅
+- [x] Enable Dexie database access
+- [x] Implement data comparison tools
+- [x] Create migration service structure
 
+### Phase 2: Core Migration ✅
+- [x] Account migration with `importFromMnemonic`
+- [x] Settings migration (excluding activeDid)
+- [x] **ActiveDid migration** ⭐ **COMPLETED**
+- [x] Contact migration framework
+
+### Phase 3: Validation and Cleanup 🔄
+- [ ] Comprehensive data validation
+- [ ] Performance testing
+- [ ] User acceptance testing
+- [ ] Dexie removal
+
+## Usage
+
+### Manual Migration
 ```typescript
-// src/services/storage/migration/MigrationService.ts
+import { migrateAll, migrateActiveDid } from '../services/indexedDBMigrationService';
-import initSqlJs from '@jlongster/sql.js';
-import { SQLiteFS } from 'absurd-sql';
-import IndexedDBBackend from 'absurd-sql/dist/indexeddb-backend';
 
-export class MigrationService {
+// Complete migration
-  private static instance: MigrationService;
+const result = await migrateAll();
-  private backup: MigrationBackup | null = null;
-  private sql: any = null;
-  private db: any = null;
 
-  async prepare(): Promise<void> {
+// Or migrate just the activeDid
-    try {
+const activeDidResult = await migrateActiveDid();
-      // 1. Check prerequisites
-      await this.checkPrerequisites();
-      
-      // 2. Create backup
-      this.backup = await this.createBackup();
-      
-      // 3. Verify backup integrity
-      await this.verifyBackup();
-      
-      // 4. Initialize absurd-sql
-      await this.initializeAbsurdSql();
-    } catch (error) {
-      throw new StorageError(
-        'Migration preparation failed',
-        StorageErrorCodes.MIGRATION_FAILED,
-        error
-      );
-    }
-  }
-
-  private async initializeAbsurdSql(): Promise<void> {
-    // Initialize SQL.js
-    this.sql = await initSqlJs({
-      locateFile: (file: string) => {
-        return new URL(`/node_modules/@jlongster/sql.js/dist/${file}`, import.meta.url).href;
-      }
-    });
-
-    // Setup SQLiteFS with IndexedDB backend
-    const sqlFS = new SQLiteFS(this.sql.FS, new IndexedDBBackend());
-    this.sql.register_for_idb(sqlFS);
-
-    // Create and mount filesystem
-    this.sql.FS.mkdir('/sql');
-    this.sql.FS.mount(sqlFS, {}, '/sql');
-
-    // Open database
-    const path = '/sql/db.sqlite';
-    if (typeof SharedArrayBuffer === 'undefined') {
-      let stream = this.sql.FS.open(path, 'a+');
-      await stream.node.contents.readIfFallback();
-      this.sql.FS.close(stream);
-    }
-
-    this.db = new this.sql.Database(path, { filename: true });
-    if (!this.db) {
-      throw new StorageError(
-        'Database initialization failed',
-        StorageErrorCodes.INITIALIZATION_FAILED
-      );
-    }
-
-    // Configure database
-    await this.db.exec(`PRAGMA journal_mode=MEMORY;`);
-  }
-
-  private async checkPrerequisites(): Promise<void> {
-    // Check IndexedDB availability
-    if (!window.indexedDB) {
-      throw new StorageError(
-        'IndexedDB not available',
-        StorageErrorCodes.INITIALIZATION_FAILED
-      );
-    }
-
-    // Check storage quota
-    const quota = await navigator.storage.estimate();
-    if (quota.quota && quota.usage && quota.usage > quota.quota * 0.9) {
-      throw new StorageError(
-        'Insufficient storage space',
-        StorageErrorCodes.STORAGE_FULL
-      );
-    }
-
-    // Check platform support
-    const capabilities = await PlatformDetection.getCapabilities();
-    if (!capabilities.hasFileSystem) {
-      throw new StorageError(
-        'Platform does not support required features',
-        StorageErrorCodes.INITIALIZATION_FAILED
-      );
-    }
-  }
-
-  private async createBackup(): Promise<MigrationBackup> {
-    const dexieDB = new Dexie('TimeSafariDB');
-    
-    return {
-      timestamp: Date.now(),
-      accounts: await dexieDB.accounts.toArray(),
-      settings: await dexieDB.settings.toArray(),
-      contacts: await dexieDB.contacts.toArray(),
-      metadata: {
-        version: '1.0.0',
-        platform: await PlatformDetection.getPlatform(),
-        dexieVersion: Dexie.version
-      }
-    };
-  }
-}
 ```
 
-### 2. Data Migration
+### Migration Verification
-
 ```typescript
-// src/services/storage/migration/DataMigration.ts
+import { compareDatabases } from '../services/indexedDBMigrationService';
-export class DataMigration {
-  async migrate(backup: MigrationBackup): Promise<void> {
-    try {
-      // 1. Create new database schema
-      await this.createSchema();
-      
-      // 2. Migrate accounts
-      await this.migrateAccounts(backup.accounts);
-      
-      // 3. Migrate settings
-      await this.migrateSettings(backup.settings);
-      
-      // 4. Migrate contacts
-      await this.migrateContacts(backup.contacts);
-      
-      // 5. Verify migration
-      await this.verifyMigration(backup);
-    } catch (error) {
-      // 6. Handle failure
-      await this.handleMigrationFailure(error, backup);
-    }
-  }
 
-  private async migrateAccounts(accounts: Account[]): Promise<void> {
+const comparison = await compareDatabases();
-    // Use transaction for atomicity
+console.log('Migration differences:', comparison.differences);
-    await this.db.exec('BEGIN TRANSACTION;');
-    try {
-      for (const account of accounts) {
-        await this.db.run(`
-          INSERT INTO accounts (did, public_key_hex, created_at, updated_at)
-          VALUES (?, ?, ?, ?)
-        `, [
-          account.did,
-          account.publicKeyHex,
-          account.createdAt,
-          account.updatedAt
-        ]);
-      }
-      await this.db.exec('COMMIT;');
-    } catch (error) {
-      await this.db.exec('ROLLBACK;');
-      throw error;
-    }
-  }
-
-  private async verifyMigration(backup: MigrationBackup): Promise<void> {
-    // Verify account count
-    const result = await this.db.exec('SELECT COUNT(*) as count FROM accounts');
-    const accountCount = result[0].values[0][0];
-    
-    if (accountCount !== backup.accounts.length) {
-      throw new StorageError(
-        'Account count mismatch',
-        StorageErrorCodes.VERIFICATION_FAILED
-      );
-    }
-
-    // Verify data integrity
-    await this.verifyDataIntegrity(backup);
-  }
-}
 ```
 
-### 3. Rollback Strategy
+## Error Handling
 
+### ActiveDid Migration Errors
+- **Missing Account**: If the `activeDid` from Dexie doesn't exist in SQLite accounts
+- **Database Errors**: Connection or query failures
+- **Settings Update Failures**: Issues updating SQLite master settings
+
+### Recovery Strategies
+1. **Automatic Recovery**: Migration continues even if activeDid migration fails
+2. **Manual Recovery**: Users can manually select their identity after migration
+3. **Fallback**: System creates new identity if none exists
+
+## Security Considerations
+
+### Data Protection
+- All sensitive data (mnemonics, private keys) are encrypted
+- Migration preserves encryption standards
+- No plaintext data exposure during migration
+
+### Identity Verification
+- ActiveDid migration validates account existence
+- Prevents setting non-existent identities as active
+- Maintains cryptographic integrity
+
+## Testing
+
+### Migration Testing
+```bash
+# Enable Dexie for testing
+# Set USE_DEXIE_DB = true in constants/app.ts
+
+# Run migration
+npm run migrate
+
+# Verify results
+npm run test:migration
+```
+
+### ActiveDid Testing
 ```typescript
-// src/services/storage/migration/RollbackService.ts
+// Test activeDid migration specifically
-export class RollbackService {
+const result = await migrateActiveDid();
-  async rollback(backup: MigrationBackup): Promise<void> {
+expect(result.success).toBe(true);
-    try {
+expect(result.warnings).toContain('Successfully migrated activeDid');
-      // 1. Stop all database operations
-      await this.stopDatabaseOperations();
-      
-      // 2. Restore from backup
-      await this.restoreFromBackup(backup);
-      
-      // 3. Verify restoration
-      await this.verifyRestoration(backup);
-      
-      // 4. Clean up absurd-sql
-      await this.cleanupAbsurdSql();
-    } catch (error) {
-      throw new StorageError(
-        'Rollback failed',
-        StorageErrorCodes.ROLLBACK_FAILED,
-        error
-      );
-    }
-  }
-
-  private async restoreFromBackup(backup: MigrationBackup): Promise<void> {
-    const dexieDB = new Dexie('TimeSafariDB');
-    
-    // Restore accounts
-    await dexieDB.accounts.bulkPut(backup.accounts);
-    
-    // Restore settings
-    await dexieDB.settings.bulkPut(backup.settings);
-    
-    // Restore contacts
-    await dexieDB.contacts.bulkPut(backup.contacts);
-  }
-}
 ```
 
-## Migration UI
+## Troubleshooting
 
-```vue
+### Common Issues
-<!-- src/components/MigrationProgress.vue -->
-<template>
-  <div class="migration-progress">
-    <h2>Database Migration</h2>
-    
-    <div class="progress-container">
-      <div class="progress-bar" :style="{ width: `${progress}%` }" />
-      <div class="progress-text">{{ progress }}%</div>
-    </div>
-    
-    <div class="status-message">{{ statusMessage }}</div>
-    
-    <div v-if="error" class="error-message">
-      {{ error }}
-      <button @click="retryMigration">Retry</button>
-    </div>
-  </div>
-</template>
 
-<script setup lang="ts">
+1. **ActiveDid Not Found**
-import { ref, onMounted } from 'vue';
+   - Ensure accounts were migrated before activeDid migration
-import { MigrationService } from '@/services/storage/migration/MigrationService';
+   - Check that the Dexie activeDid exists in SQLite accounts
 
-const progress = ref(0);
+2. **Migration Failures**
-const statusMessage = ref('Preparing migration...');
+   - Verify Dexie database is accessible
-const error = ref<string | null>(null);
+   - Check SQLite database permissions
+   - Review migration logs for specific errors
 
-const migrationService = MigrationService.getInstance();
+3. **Data Inconsistencies**
+   - Use `compareDatabases()` to identify differences
+   - Re-run migration if necessary
+   - Check for duplicate or conflicting records
 
-async function startMigration() {
+### Debugging
-  try {
+```typescript
-    // 1. Preparation
+// Enable detailed logging
-    statusMessage.value = 'Creating backup...';
+logger.setLevel('debug');
-    await migrationService.prepare();
-    progress.value = 20;
-    
-    // 2. Data migration
-    statusMessage.value = 'Migrating data...';
-    await migrationService.migrate();
-    progress.value = 80;
-    
-    // 3. Verification
-    statusMessage.value = 'Verifying migration...';
-    await migrationService.verify();
-    progress.value = 100;
-    
-    statusMessage.value = 'Migration completed successfully!';
-  } catch (err) {
-    error.value = err instanceof Error ? err.message : 'Migration failed';
-    statusMessage.value = 'Migration failed';
-  }
-}
 
-async function retryMigration() {
+// Check migration status
-  error.value = null;
+const comparison = await compareDatabases();
-  progress.value = 0;
+console.log('Settings differences:', comparison.differences.settings);
-  await startMigration();
-}
-
-onMounted(() => {
-  startMigration();
-});
-</script>
-
-<style scoped>
-.migration-progress {
-  padding: 2rem;
-  max-width: 600px;
-  margin: 0 auto;
-}
-
-.progress-container {
-  position: relative;
-  height: 20px;
-  background: #eee;
-  border-radius: 10px;
-  overflow: hidden;
-  margin: 1rem 0;
-}
-
-.progress-bar {
-  position: absolute;
-  height: 100%;
-  background: #4CAF50;
-  transition: width 0.3s ease;
-}
-
-.progress-text {
-  position: absolute;
-  width: 100%;
-  text-align: center;
-  line-height: 20px;
-  color: #000;
-}
-
-.status-message {
-  text-align: center;
-  margin: 1rem 0;
-}
-
-.error-message {
-  color: #f44336;
-  text-align: center;
-  margin: 1rem 0;
-}
-
-button {
-  margin-top: 1rem;
-  padding: 0.5rem 1rem;
-  background: #2196F3;
-  color: white;
-  border: none;
-  border-radius: 4px;
-  cursor: pointer;
-}
-
-button:hover {
-  background: #1976D2;
-}
-</style>
 ```
 
-## Testing Strategy
+## Future Enhancements
 
-1. **Unit Tests**
+### Planned Improvements
-   ```typescript
+1. **Batch Processing**: Optimize for large datasets
-   // src/services/storage/migration/__tests__/MigrationService.spec.ts
+2. **Incremental Migration**: Support partial migrations
-   describe('MigrationService', () => {
+3. **Rollback Capability**: Ability to revert migration
-     it('should initialize absurd-sql correctly', async () => {
+4. **Progress Tracking**: Real-time migration progress
-       const service = MigrationService.getInstance();
-       await service.initializeAbsurdSql();
-       
-       expect(service.isInitialized()).toBe(true);
-       expect(service.getDatabase()).toBeDefined();
-     });
 
-     it('should create valid backup', async () => {
+### Performance Optimizations
-       const service = MigrationService.getInstance();
+1. **Parallel Processing**: Migrate independent data concurrently
-       const backup = await service.createBackup();
+2. **Memory Management**: Optimize for large datasets
-       
+3. **Transaction Batching**: Reduce database round trips
-       expect(backup).toBeDefined();
-       expect(backup.accounts).toBeInstanceOf(Array);
-       expect(backup.settings).toBeInstanceOf(Array);
-       expect(backup.contacts).toBeInstanceOf(Array);
-     });
 
-     it('should migrate data correctly', async () => {
+## Conclusion
-       const service = MigrationService.getInstance();
-       const backup = await service.createBackup();
-       
-       await service.migrate(backup);
-       
-       // Verify migration
-       const accounts = await service.getMigratedAccounts();
-       expect(accounts).toHaveLength(backup.accounts.length);
-     });
 
-     it('should handle rollback correctly', async () => {
+The Dexie to SQLite migration provides a robust, secure, and user-friendly transition path. The addition of activeDid migration ensures that users maintain their identity continuity throughout the migration process, significantly improving the user experience.
-       const service = MigrationService.getInstance();
-       const backup = await service.createBackup();
-       
-       // Simulate failed migration
-       await service.migrate(backup);
-       await service.simulateFailure();
-       
-       // Perform rollback
-       await service.rollback(backup);
-       
-       // Verify rollback
-       const accounts = await service.getOriginalAccounts();
-       expect(accounts).toHaveLength(backup.accounts.length);
-     });
-   });
-   ```
 
-2. **Integration Tests**
+The migration fence architecture allows for controlled, reversible migration while maintaining application stability and data integrity. 
-   ```typescript
-   // src/services/storage/migration/__tests__/integration/Migration.spec.ts
-   describe('Migration Integration', () => {
-     it('should handle concurrent access during migration', async () => {
-       const service = MigrationService.getInstance();
-       
-       // Start migration
-       const migrationPromise = service.migrate();
-       
-       // Simulate concurrent access
-       const accessPromises = Array(5).fill(null).map(() =>
-         service.getAccount('did:test:123')
-       );
-       
-       // Wait for all operations
-       const [migrationResult, ...accessResults] = await Promise.allSettled([
-         migrationPromise,
-         ...accessPromises
-       ]);
-       
-       // Verify results
-       expect(migrationResult.status).toBe('fulfilled');
-       expect(accessResults.some(r => r.status === 'rejected')).toBe(true);
-     });
-
-     it('should maintain data integrity during platform transition', async () => {
-       const service = MigrationService.getInstance();
-       
-       // Simulate platform change
-       await service.simulatePlatformChange();
-       
-       // Verify data
-       const accounts = await service.getAllAccounts();
-       const settings = await service.getAllSettings();
-       const contacts = await service.getAllContacts();
-       
-       expect(accounts).toBeDefined();
-       expect(settings).toBeDefined();
-       expect(contacts).toBeDefined();
-     });
-   });
-   ```
-
-## Success Criteria
-
-1. **Data Integrity**
-   - [ ] All accounts migrated successfully
-   - [ ] All settings preserved
-   - [ ] All contacts transferred
-   - [ ] No data corruption
-
-2. **Performance**
-   - [ ] Migration completes within acceptable time
-   - [ ] No significant performance degradation
-   - [ ] Efficient storage usage
-   - [ ] Smooth user experience
-
-3. **Security**
-   - [ ] Encrypted data remains secure
-   - [ ] Access controls maintained
-   - [ ] No sensitive data exposure
-   - [ ] Secure backup process
-
-4. **User Experience**
-   - [ ] Clear migration progress
-   - [ ] Informative error messages
-   - [ ] Automatic recovery from failures
-   - [ ] No data loss
-
-## Rollback Plan
-
-1. **Automatic Rollback**
-   - Triggered by migration failure
-   - Restores from verified backup
-   - Maintains data consistency
-   - Logs rollback reason
-
-2. **Manual Rollback**
-   - Available through settings
-   - Requires user confirmation
-   - Preserves backup data
-   - Provides rollback status
-
-3. **Emergency Recovery**
-   - Manual backup restoration
-   - Database repair tools
-   - Data recovery procedures
-   - Support contact information
-
-## Post-Migration
-
-1. **Verification**
-   - Data integrity checks
-   - Performance monitoring
-   - Error rate tracking
-   - User feedback collection
-
-2. **Cleanup**
-   - Remove old database
-   - Clear migration artifacts
-   - Update application state
-   - Archive backup data
-
-3. **Monitoring**
-   - Track migration success rate
-   - Monitor performance metrics
-   - Collect error reports
-   - Gather user feedback
-
-## Support
-
-For assistance with migration:
-1. Check the troubleshooting guide
-2. Review error logs
-3. Contact support team
-4. Submit issue report
-
-## Timeline
-
-1. **Preparation Phase** (1 week)
-   - Backup system implementation
-   - Migration service development
-   - Testing framework setup
-
-2. **Testing Phase** (2 weeks)
-   - Unit testing
-   - Integration testing
-   - Performance testing
-   - Security testing
-
-3. **Deployment Phase** (1 week)
-   - Staged rollout
-   - Monitoring
-   - Support preparation
-   - Documentation updates
-
-4. **Post-Deployment** (2 weeks)
-   - Monitoring
-   - Bug fixes
-   - Performance optimization
-   - User feedback collection 

index.html

@@ -15,17 +15,21 @@
     <script type="module">
       const platform = process.env.VITE_PLATFORM;
       switch (platform) {
-        case 'capacitor':
+        case 'capacitor': // BuildPlatform.Capacitor
           import('./src/main.capacitor.ts');
           break;
-        case 'electron':
+        case 'electron': // BuildPlatform.Electron
           import('./src/main.electron.ts');
           break;
-        case 'pywebview':
+        case 'pywebview': // BuildPlatform.PyWebView
           import('./src/main.pywebview.ts');
           break;
-        default:
+        case 'web': // BuildPlatform.Web
           import('./src/main.web.ts');
+          break;
+        default:
+          console.error(`Unknown platform: ${platform}`);
+          throw new Error(`Unknown platform: ${platform}`);
       }
     </script>
   </body>

ios/.gitignore

@@ -11,3 +11,16 @@ capacitor-cordova-ios-plugins
 # Generated Config files
 App/App/capacitor.config.json
 App/App/config.xml
+
+# User-specific Xcode files
+App/App.xcodeproj/xcuserdata/*.xcuserdatad/
+App/App.xcodeproj/*.xcuserstate
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+
+# Generated Icons from capacitor-assets (also Contents.json which is confusing; see BUILDING.md)
+App/App/Assets.xcassets/AppIcon.appiconset
+App/App/Assets.xcassets/Splash.imageset

ios/App/App.xcodeproj/project.pbxproj

@@ -14,7 +14,7 @@
 		504EC30F1FED79650016851F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30E1FED79650016851F /* Assets.xcassets */; };
 		504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC3101FED79650016851F /* LaunchScreen.storyboard */; };
 		50B271D11FEDC1A000F3C39B /* public in Resources */ = {isa = PBXBuildFile; fileRef = 50B271D01FEDC1A000F3C39B /* public */; };
-		A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */; };
+		97EF2DC6FD76C3643D680B8D /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 90DCAFB4D8948F7A50C13800 /* Pods_App.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -27,9 +27,9 @@
 		504EC3111FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		504EC3131FED79650016851F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		50B271D01FEDC1A000F3C39B /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = "<group>"; };
-		AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		90DCAFB4D8948F7A50C13800 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = "<group>"; };
+		E2E9297D5D02C549106C77F9 /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = "<group>"; };
-		FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = "<group>"; };
+		EAEC6436E595F7CD3A1C9E96 /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -37,17 +37,17 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */,
+				97EF2DC6FD76C3643D680B8D /* Pods_App.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		27E2DDA53C4D2A4D1A88CE4A /* Frameworks */ = {
+		4B546315E668C7A13939F417 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */,
+				90DCAFB4D8948F7A50C13800 /* Pods_App.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -57,8 +57,8 @@
 			children = (
 				504EC3061FED79650016851F /* App */,
 				504EC3051FED79650016851F /* Products */,
-				7F8756D8B27F46E3366F6CEA /* Pods */,
+				BA325FFCDCE8D334E5C7AEBE /* Pods */,
-				27E2DDA53C4D2A4D1A88CE4A /* Frameworks */,
+				4B546315E668C7A13939F417 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -85,13 +85,13 @@
 			path = App;
 			sourceTree = "<group>";
 		};
-		7F8756D8B27F46E3366F6CEA /* Pods */ = {
+		BA325FFCDCE8D334E5C7AEBE /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */,
+				EAEC6436E595F7CD3A1C9E96 /* Pods-App.debug.xcconfig */,
-				AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */,
+				E2E9297D5D02C549106C77F9 /* Pods-App.release.xcconfig */,
 			);
-			name = Pods;
+			path = Pods;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -101,12 +101,13 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 504EC3161FED79650016851F /* Build configuration list for PBXNativeTarget "App" */;
 			buildPhases = (
-				6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */,
+				92977BEA1068CC097A57FC77 /* [CP] Check Pods Manifest.lock */,
 				504EC3001FED79650016851F /* Sources */,
 				504EC3011FED79650016851F /* Frameworks */,
 				504EC3021FED79650016851F /* Resources */,
-				9592DBEFFC6D2A0C8D5DEB22 /* [CP] Embed Pods Frameworks */,
 				012076E8FFE4BF260A79B034 /* Fix Privacy Manifest */,
+				3525031ED1C96EF4CF6E9959 /* [CP] Embed Pods Frameworks */,
+				96A7EF592DF3366D00084D51 /* Fix Privacy Manifest */,
 			);
 			buildRules = (
 			);
@@ -186,28 +187,10 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PROJECT_DIR}/app_privacy_manifest_fixer/fixer.sh\" ";
+			shellScript = "\"${PROJECT_DIR}/app_privacy_manifest_fixer/fixer.sh\" \n";
 			showEnvVarsInLog = 0;
 		};
-		6634F4EFEBD30273BCE97C65 /* [CP] Check Pods Manifest.lock */ = {
+		3525031ED1C96EF4CF6E9959 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-App-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-		9592DBEFFC6D2A0C8D5DEB22 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -222,6 +205,47 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		92977BEA1068CC097A57FC77 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-App-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		96A7EF592DF3366D00084D51 /* Fix Privacy Manifest */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Fix Privacy Manifest";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "$PROJECT_DIR/app_privacy_manifest_fixer/fixer.sh\n";
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -375,11 +399,12 @@
 		};
 		504EC3171FED79650016851F /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */;
+			baseConfigurationReference = EAEC6436E595F7CD3A1C9E96 /* Pods-App.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 18;
+				CURRENT_PROJECT_VERSION = 35;
+				DEVELOPMENT_TEAM = GM3FS5JQPH;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = App/Info.plist;
@@ -388,7 +413,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.4.7;
+				MARKETING_VERSION = 1.0.2;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -401,11 +426,12 @@
 		};
 		504EC3181FED79650016851F /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */;
+			baseConfigurationReference = E2E9297D5D02C549106C77F9 /* Pods-App.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 18;
+				CURRENT_PROJECT_VERSION = 35;
+				DEVELOPMENT_TEAM = GM3FS5JQPH;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = App/Info.plist;
@@ -414,7 +440,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.4.7;
+				MARKETING_VERSION = 1.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";

ios/App/App/AppDelegate.swift

@@ -9,8 +9,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Initialize SQLite
-        let sqlite = SQLite()
+        //let sqlite = SQLite()
-        sqlite.initialize()
+        //sqlite.initialize()
         
         // Override point for customization after application launch.
         return true

ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,14 +0,0 @@
-{
-  "images": [
-    {
-      "idiom": "universal",
-      "size": "1024x1024",
-      "filename": "AppIcon-512@2x.png",
-      "platform": "ios"
-    }
-  ],
-  "info": {
-    "author": "xcode",
-    "version": 1
-  }
-}

ios/App/App/Assets.xcassets/Splash.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "splash-2732x2732-2.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "splash-2732x2732-1.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "splash-2732x2732.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

ios/App/App/Info.plist

@@ -37,8 +37,6 @@
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
@@ -49,5 +47,16 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<true/>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>app.timesafari</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>timesafari</string>
+			</array>
+		</dict>
+	</array>
 </dict>
 </plist>

ios/App/Podfile

@@ -27,4 +27,9 @@ end
 
 post_install do |installer|
   assertDeploymentTarget(installer)
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+      config.build_settings['EXCLUDED_ARCHS[sdk=iphonesimulator*]'] = 'arm64'
+    end
+  end
 end

ios/App/Podfile.lock

@@ -5,6 +5,10 @@ PODS:
     - Capacitor
   - CapacitorCamera (6.1.2):
     - Capacitor
+  - CapacitorCommunitySqlite (6.0.2):
+    - Capacitor
+    - SQLCipher
+    - ZIPFoundation
   - CapacitorCordova (6.2.1)
   - CapacitorFilesystem (6.0.3):
     - Capacitor
@@ -73,11 +77,18 @@ PODS:
   - nanopb/decode (2.30910.0)
   - nanopb/encode (2.30910.0)
   - PromisesObjC (2.4.0)
+  - SQLCipher (4.9.0):
+    - SQLCipher/standard (= 4.9.0)
+  - SQLCipher/common (4.9.0)
+  - SQLCipher/standard (4.9.0):
+    - SQLCipher/common
+  - ZIPFoundation (0.9.19)
 
 DEPENDENCIES:
   - "Capacitor (from `../../node_modules/@capacitor/ios`)"
   - "CapacitorApp (from `../../node_modules/@capacitor/app`)"
   - "CapacitorCamera (from `../../node_modules/@capacitor/camera`)"
+  - "CapacitorCommunitySqlite (from `../../node_modules/@capacitor-community/sqlite`)"
   - "CapacitorCordova (from `../../node_modules/@capacitor/ios`)"
   - "CapacitorFilesystem (from `../../node_modules/@capacitor/filesystem`)"
   - "CapacitorMlkitBarcodeScanning (from `../../node_modules/@capacitor-mlkit/barcode-scanning`)"
@@ -98,6 +109,8 @@ SPEC REPOS:
     - MLKitVision
     - nanopb
     - PromisesObjC
+    - SQLCipher
+    - ZIPFoundation
 
 EXTERNAL SOURCES:
   Capacitor:
@@ -106,6 +119,8 @@ EXTERNAL SOURCES:
     :path: "../../node_modules/@capacitor/app"
   CapacitorCamera:
     :path: "../../node_modules/@capacitor/camera"
+  CapacitorCommunitySqlite:
+    :path: "../../node_modules/@capacitor-community/sqlite"
   CapacitorCordova:
     :path: "../../node_modules/@capacitor/ios"
   CapacitorFilesystem:
@@ -121,6 +136,7 @@ SPEC CHECKSUMS:
   Capacitor: c95400d761e376be9da6be5a05f226c0e865cebf
   CapacitorApp: e1e6b7d05e444d593ca16fd6d76f2b7c48b5aea7
   CapacitorCamera: 9bc7b005d0e6f1d5f525b8137045b60cffffce79
+  CapacitorCommunitySqlite: 0299d20f4b00c2e6aa485a1d8932656753937b9b
   CapacitorCordova: 8d93e14982f440181be7304aa9559ca631d77fff
   CapacitorFilesystem: 59270a63c60836248812671aa3b15df673fbaf74
   CapacitorMlkitBarcodeScanning: 7652be9c7922f39203a361de735d340ae37e134e
@@ -138,7 +154,9 @@ SPEC CHECKSUMS:
   MLKitVision: 90922bca854014a856f8b649d1f1f04f63fd9c79
   nanopb: 438bc412db1928dac798aa6fd75726007be04262
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
+  SQLCipher: 31878d8ebd27e5c96db0b7cb695c96e9f8ad77da
+  ZIPFoundation: b8c29ea7ae353b309bc810586181fd073cb3312c
 
-PODFILE CHECKSUM: 7e7e09e6937de7f015393aecf2cf7823645689b3
+PODFILE CHECKSUM: f987510f7383b04a1b09ea8472bdadcd88b6c924
 
 COCOAPODS: 1.16.2

package.json

@@ -1,52 +1,45 @@
 {
   "name": "timesafari",
-  "version": "0.4.6",
+  "version": "1.0.3-beta",
   "description": "Time Safari Application",
   "author": {
     "name": "Time Safari Team"
   },
   "scripts": {
-    "dev": "vite --config vite.config.dev.mts --host",
+    "build-start:pywebview": "vite build --config vite.config.pywebview.mts && .venv/bin/python src/pywebview/main.py",
-    "serve": "vite preview",
+    "build:android": "npm run clean:android && rm -rf dist && npm run build:web && npm run build:capacitor && cd android && ./gradlew clean && ./gradlew assembleDebug && cd .. && npx cap sync android && npx capacitor-assets generate --android && npx cap open android",
-    "build": "VITE_GIT_HASH=`git log -1 --pretty=format:%h` vite build --config vite.config.mts",
+    "build:capacitor": "vite build --config vite.config.capacitor.mts",
-    "lint": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src",
+    "build:electron": "npm run clean:electron && tsc -p tsconfig.electron.json && vite build --config vite.config.electron.mts && node scripts/build-electron.js",
-    "lint-fix": "eslint --ext .js,.ts,.vue --ignore-path .gitignore --fix src",
+    "build:electron-linux": "npm run build:electron && electron-builder --linux AppImage",
-    "prebuild": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src && node sw_combine.js && node scripts/copy-wasm.js",
+    "build:electron-linux-deb": "npm run build:electron && electron-builder --linux deb",
-    "test:all": "npm run test:prerequisites && npm run build && npm run test:web && npm run test:mobile",
+    "build:electron-linux-prod": "NODE_ENV=prod npm run build:electron && electron-builder --linux AppImage",
-    "test:prerequisites": "node scripts/check-prerequisites.js",
+    "build:electron-mac": "npm run build:electron-prod && electron-builder --mac",
-    "test:web": "npx playwright test -c playwright.config-local.ts --trace on",
+    "build:electron-mac-universal": "npm run build:electron-prod && electron-builder --mac --universal",
-    "test:mobile": "npm run build:capacitor && npm run test:android && npm run test:ios",
+    "build:electron-prod": "NODE_ENV=prod npm run build:electron",
-    "test:android": "node scripts/test-android.js",
+    "build:pywebview": "vite build --config vite.config.pywebview.mts",
-    "test:ios": "node scripts/test-ios.js",
+    "build:web": "VITE_GIT_HASH=`git log -1 --pretty=format:%h` vite build --config vite.config.web.mts",
     "check:android-device": "adb devices | grep -w 'device' || (echo 'No Android device connected' && exit 1)",
     "check:ios-device": "xcrun xctrace list devices 2>&1 | grep -w 'Booted' || (echo 'No iOS simulator running' && exit 1)",
-    "clean:electron": "rimraf dist-electron",
-    "build:pywebview": "vite build --config vite.config.pywebview.mts",
-    "build:electron": "npm run clean:electron && tsc -p tsconfig.electron.json && vite build --config vite.config.electron.mts && node scripts/build-electron.js",
-    "build:capacitor": "vite build --mode capacitor --config vite.config.capacitor.mts",
-    "build:web": "VITE_GIT_HASH=`git log -1 --pretty=format:%h` vite build --config vite.config.web.mts",
-    "electron:dev": "npm run build && electron .",
-    "electron:start": "electron .",
     "clean:android": "adb uninstall app.timesafari.app || true",
-    "build:android": "npm run clean:android && rm -rf dist && npm run build:web && npm run build:capacitor && cd android && ./gradlew clean && ./gradlew assembleDebug && cd .. && npx cap sync android && npx capacitor-assets generate --android && npx cap open android",
+    "clean:electron": "rimraf dist-electron",
-    "electron:build-linux": "npm run build:electron && electron-builder --linux AppImage",
+    "lint": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src",
-    "electron:build-linux-deb": "npm run build:electron && electron-builder --linux deb",
+    "lint-fix": "eslint --ext .js,.ts,.vue --ignore-path .gitignore --fix src",
-    "electron:build-linux-prod": "NODE_ENV=production npm run build:electron && electron-builder --linux AppImage",
+    "package:pywebview-linux": "vite build --config vite.config.pywebview.mts && .venv/bin/python -m PyInstaller --name TimeSafari --add-data 'dist:www' src/pywebview/main.py",
-    "build:electron-prod": "NODE_ENV=production npm run build:electron",
+    "package:pywebview-mac": "vite build --config vite.config.pywebview.mts && .venv/bin/python -m PyInstaller --name TimeSafari --add-data 'dist:www' src/pywebview/main.py",
-    "pywebview:dev": "vite build --config vite.config.pywebview.mts && .venv/bin/python src/pywebview/main.py",
+    "package:pywebview-win": "vite build --config vite.config.pywebview.mts && .venv/Scripts/python -m PyInstaller --name TimeSafari --add-data 'dist;www' src/pywebview/main.py",
-    "pywebview:build": "vite build --config vite.config.pywebview.mts && .venv/bin/python src/pywebview/main.py",
+    "prebuild": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src && node sw_combine.js && node scripts/copy-wasm.js",
-    "pywebview:package-linux": "vite build --mode pywebview --config vite.config.pywebview.mts && .venv/bin/python -m PyInstaller --name TimeSafari --add-data 'dist:www' src/pywebview/main.py",
+    "serve:web": "vite preview",
-    "pywebview:package-win": "vite build --mode pywebview --config vite.config.pywebview.mts && .venv/Scripts/python -m PyInstaller --name TimeSafari --add-data 'dist;www' src/pywebview/main.py",
+    "start:electron": "electron .",
-    "pywebview:package-mac": "vite build --mode pywebview --config vite.config.pywebview.mts && .venv/bin/python -m PyInstaller --name TimeSafari --add-data 'dist:www' src/pywebview/main.py",
+    "start:web": "vite --config vite.config.web.mts --host",
-    "fastlane:ios:beta": "cd ios && fastlane beta",
+    "test:all": "npm run test:prerequisites && npm run build && npm run test:web && npm run test:mobile",
-    "fastlane:ios:release": "cd ios && fastlane release",
+    "test:android": "node scripts/test-android.js",
-    "fastlane:android:beta": "cd android && fastlane beta",
+    "test:ios": "node scripts/test-ios.js",
-    "fastlane:android:release": "cd android && fastlane release",
+    "test:mobile": "npm run build:capacitor && npm run test:android && npm run test:ios",
-    "electron:build-mac": "npm run build:electron-prod && electron-builder --mac",
+    "test:prerequisites": "node scripts/check-prerequisites.js",
-    "electron:build-mac-universal": "npm run build:electron-prod && electron-builder --mac --universal"
+    "test:web": "npx playwright test -c playwright.config-local.ts --trace on"
   },
   "dependencies": {
-    "@capacitor-community/sqlite": "^6.0.2",
+    "@capacitor-community/sqlite": "6.0.2",
     "@capacitor-mlkit/barcode-scanning": "^6.0.0",
     "@capacitor/android": "^6.2.0",
     "@capacitor/app": "^6.0.0",
@@ -171,7 +164,7 @@
   },
   "main": "./dist-electron/main.js",
   "build": {
-    "appId": "app.timesafari",
+    "appId": "app.timesafari.app",
     "productName": "TimeSafari",
     "directories": {
       "output": "dist-electron-packages"

pkgx.yaml

@@ -2,5 +2,6 @@ dependencies:
   - gradle
   - java
   - pod
+  - rubygems.org
 
 # other dependencies are discovered via package.json & requirements.txt & Gemfile (I'm guessing).

playwright.config-local.ts

@@ -101,7 +101,7 @@ export default defineConfig({
   /**
    * This could be an array of servers, meaning we could start the Endorser server as well:
    *     {
-   *       command: "cd ../endorser-ch; NODE_ENV=test-local npm run dev",
+   *       command: "cd ../endorser-ch; NODE_ENV=test-local npm run start:web",
    *       url: 'http://localhost:3000',
    *       reuseExistingServer: !process.env.CI,
    *     },
@@ -112,7 +112,7 @@ export default defineConfig({
    */
   webServer: {
     command:
-      "VITE_APP_SERVER=http://localhost:8081 VITE_DEFAULT_ENDORSER_API_SERVER=http://localhost:3000 VITE_DEFAULT_PARTNER_API_SERVER=http://localhost:3000 VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app VITE_PASSKEYS_ENABLED=true npm run dev -- --port=8081",
+      "NODE_ENV=dev VITE_APP_SERVER=http://localhost:8081 VITE_DEFAULT_ENDORSER_API_SERVER=http://localhost:3000 VITE_DEFAULT_PARTNER_API_SERVER=http://localhost:3000 VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app VITE_PASSKEYS_ENABLED=true npm run start:web -- --port=8081",
     url: "http://localhost:8081",
     reuseExistingServer: !process.env.CI,
   },

playwright.config.ts

@@ -74,7 +74,7 @@ export default defineConfig({
   /* Run your local dev server before starting the tests */
   // webServer: {
   //   command:
-  //     "VITE_PASSKEYS_ENABLED=true VITE_DEFAULT_ENDORSER_API_SERVER=http://localhost:3000 npm run dev",
+  //     "VITE_PASSKEYS_ENABLED=true VITE_DEFAULT_ENDORSER_API_SERVER=http://localhost:3000 npm run start:web",
   //   url: "http://localhost:8080",
   //   reuseExistingServer: !process.env.CI,
   // },

requirements.txt

@@ -1,5 +1,6 @@
 eth_keys
 pywebview
 pyinstaller>=6.12.0
+setuptools>=69.0.0  # Required for distutils for electron-builder on macOS
 # For development
 watchdog>=3.0.0  # For file watching support 

scripts/check-prerequisites.js

@@ -51,7 +51,7 @@ const { existsSync } = require('fs');
  */
 function checkCommand(command, errorMessage) {
     try {
-        execSync(command + ' --version', { stdio: 'ignore' });
+        execSync(command, { stdio: 'ignore' });
         return true;
     } catch (e) {
         console.error(`❌ ${errorMessage}`);
@@ -164,10 +164,10 @@ function main() {
 
     // Check required command line tools
     // These are essential for building and testing the application
-    success &= checkCommand('node', 'Node.js is required');
+    success &= checkCommand('node --version', 'Node.js is required');
-    success &= checkCommand('npm', 'npm is required');
+    success &= checkCommand('npm --version', 'npm is required');
-    success &= checkCommand('gradle', 'Gradle is required for Android builds');
+    success &= checkCommand('gradle --version', 'Gradle is required for Android builds');
-    success &= checkCommand('xcodebuild', 'Xcode is required for iOS builds');
+    success &= checkCommand('xcodebuild --help', 'Xcode is required for iOS builds');
 
     // Check platform-specific development environments
     success &= checkAndroidSetup();

scripts/test-android.js

@@ -170,7 +170,7 @@ const executeDeeplink = async (url, description, log) => {
     
     try {
         // Stop the app before executing the deep link
-        execSync('adb shell am force-stop app.timesafari');
+        execSync('adb shell am force-stop app.timesafari.app');
         await new Promise(resolve => setTimeout(resolve, 1000)); // Wait 1s
         
         execSync(`adb shell am start -W -a android.intent.action.VIEW -d "${url}" -c android.intent.category.BROWSABLE`);

src/App.vue

@@ -4,7 +4,7 @@
   <!-- Messages in the upper-right - https://github.com/emmanuelsw/notiwind -->
   <NotificationGroup group="alert">
     <div
-      class="fixed top-[calc(env(safe-area-inset-top)+1rem)] right-4 left-4 sm:left-auto sm:w-full sm:max-w-sm flex flex-col items-start justify-end"
+      class="fixed z-[90] top-[max(1rem,env(safe-area-inset-top))] right-4 left-4 sm:left-auto sm:w-full sm:max-w-sm flex flex-col items-start justify-end"
     >
       <Notification
         v-slot="{ notifications, close }"
@@ -548,13 +548,13 @@ export default class App extends Vue {
 
 <style>
 #Content {
-  padding-left: 1.5rem;
+  padding-left: max(1.5rem, env(safe-area-inset-left));
-  padding-right: 1.5rem;
+  padding-right: max(1.5rem, env(safe-area-inset-right));
-  padding-top: calc(env(safe-area-inset-top) + 1.5rem);
+  padding-top: max(1.5rem, env(safe-area-inset-top));
-  padding-bottom: calc(env(safe-area-inset-bottom) + 1.5rem);
+  padding-bottom: max(1.5rem, env(safe-area-inset-bottom));
 }
 
 #QuickNav ~ #Content {
-  padding-bottom: calc(env(safe-area-inset-bottom) + 6rem);
+  padding-bottom: calc(env(safe-area-inset-bottom) + 6.333rem);
 }
 </style>

src/assets/icons.json

@@ -0,0 +1,75 @@
+{
+  "warning": {
+    "fillRule": "evenodd",
+    "d": "M8.257 3.099c.765-1.36 2.722-1.36 3.486 0l5.58 9.92c.75 1.334-.213 2.98-1.742 2.98H4.42c-1.53 0-2.493-1.646-1.743-2.98l5.58-9.92zM11 13a1 1 0 11-2 0 1 1 0 012 0zm-1-8a1 1 0 00-1 1v3a1 1 0 002 0V6a1 1 0 00-1-1z",
+    "clipRule": "evenodd"
+  },
+  "spinner": {
+    "d": "M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
+  },
+  "chart": {
+    "strokeLinecap": "round",
+    "strokeLinejoin": "round",
+    "strokeWidth": "2",
+    "d": "M9 19v-6a2 2 0 00-2-2H5a2 2 0 00-2 2v6a2 2 0 002 2h2a2 2 0 002-2zm0 0V9a2 2 0 012-2h2a2 2 0 012 2v10m-6 0a2 2 0 002 2h2a2 2 0 002-2m0 0V5a2 2 0 012-2h2a2 2 0 012 2v14a2 2 0 01-2 2h-2a2 2 0 01-2-2z"
+  },
+  "plus": {
+    "strokeLinecap": "round",
+    "strokeLinejoin": "round",
+    "strokeWidth": "2",
+    "d": "M12 4v16m8-8H4"
+  },
+  "settings": {
+    "strokeLinecap": "round",
+    "strokeLinejoin": "round",
+    "strokeWidth": "2",
+    "d": "M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z"
+  },
+  "settingsDot": {
+    "strokeLinecap": "round",
+    "strokeLinejoin": "round",
+    "strokeWidth": "2",
+    "d": "M15 12a3 3 0 11-6 0 3 3 0 016 0z"
+  },
+  "lock": {
+    "strokeLinecap": "round",
+    "strokeLinejoin": "round",
+    "strokeWidth": "2",
+    "d": "M12 15v2m-6 4h12a2 2 0 002-2v-6a2 2 0 00-2-2H6a2 2 0 00-2 2v6a2 2 0 002 2zm10-10V7a4 4 0 00-8 0v4h8z"
+  },
+  "download": {
+    "strokeLinecap": "round",
+    "strokeLinejoin": "round",
+    "strokeWidth": "2",
+    "d": "M12 10v6m0 0l-3-3m3 3l3-3m2 8H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z"
+  },
+  "check": {
+    "strokeLinecap": "round",
+    "strokeLinejoin": "round",
+    "strokeWidth": "2",
+    "d": "M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"
+  },
+  "edit": {
+    "strokeLinecap": "round",
+    "strokeLinejoin": "round",
+    "strokeWidth": "2",
+    "d": "M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z"
+  },
+  "trash": {
+    "strokeLinecap": "round",
+    "strokeLinejoin": "round",
+    "strokeWidth": "2",
+    "d": "M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"
+  },
+  "plusCircle": {
+    "strokeLinecap": "round",
+    "strokeLinejoin": "round",
+    "strokeWidth": "2",
+    "d": "M12 6v6m0 0v6m0-6h6m-6 0H6"
+  },
+  "info": {
+    "fillRule": "evenodd",
+    "d": "M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7-4a1 1 0 11-2 0 1 1 0 012 0zM9 9a1 1 0 000 2v3a1 1 0 001 1h1a1 1 0 100-2v-3a1 1 0 00-1-1H9z",
+    "clipRule": "evenodd"
+  }
+} 

src/components/ActivityListItem.vue

@@ -14,22 +14,34 @@
       class="flex items-center justify-between gap-2 text-lg bg-slate-200 border border-slate-300 border-b-0 rounded-t-md px-3 sm:px-4 py-1 sm:py-2"
     >
       <div class="flex items-center gap-2">
-        <div v-if="record.issuerDid">
+        <router-link
+          v-if="record.issuerDid && !isHiddenDid(record.issuerDid)"
+          :to="{
+            path: '/did/' + encodeURIComponent(record.issuerDid),
+          }"
+          title="More details about this person"
+        >
           <EntityIcon
             :entity-id="record.issuerDid"
             class="rounded-full bg-white overflow-hidden !size-[2rem] object-cover"
           />
-        </div>
+        </router-link>
-        <div v-else>
+        <font-awesome
-          <font-awesome
+          v-else-if="isHiddenDid(record.issuerDid)"
-            icon="person-circle-question"
+          icon="eye-slash"
-            class="text-slate-300 text-[2rem]"
+          class="text-slate-400 !size-[2rem] cursor-pointer"
-          />
+          @click="notifyHiddenPerson"
-        </div>
+        />
+        <font-awesome
+          v-else
+          icon="person-circle-question"
+          class="text-slate-400 !size-[2rem] cursor-pointer"
+          @click="notifyUnknownPerson"
+        />
 
         <div>
-          <h3 class="font-semibold">
+          <h3 v-if="record.issuer.known" class="font-semibold leading-tight">
-            {{ record.issuer.known ? record.issuer.displayName : "" }}
+            {{ record.issuer.displayName }}
           </h3>
           <p class="ms-auto text-xs text-slate-500 italic">
             {{ friendlyDate }}
@@ -37,7 +49,11 @@
         </div>
       </div>
 
-      <a class="cursor-pointer" @click="$emit('loadClaim', record.jwtId)">
+      <a
+        class="cursor-pointer"
+        data-testid="circle-info-link"
+        @click="$emit('loadClaim', record.jwtId)"
+      >
         <font-awesome icon="circle-info" class="fa-fw text-slate-500" />
       </a>
     </div>
@@ -46,7 +62,7 @@
       <!-- Record Image -->
       <div
         v-if="record.image"
-        class="bg-cover mb-6 -mt-3 sm:-mt-4 -mx-3 sm:-mx-4"
+        class="bg-cover mb-2 -mt-3 sm:-mt-4 -mx-3 sm:-mx-4"
         :style="`background-image: url(${record.image});`"
       >
         <a
@@ -62,29 +78,59 @@
         </a>
       </div>
 
+      <!-- Description -->
+      <p class="font-medium">
+        <a class="cursor-pointer" @click="$emit('loadClaim', record.jwtId)">
+          {{ description }}
+        </a>
+      </p>
+
       <div
-        class="relative flex justify-between gap-4 max-w-[40rem] mx-auto mb-5"
+        class="relative flex justify-between gap-4 max-w-[40rem] mx-auto mt-4"
       >
         <!-- Source -->
         <div
-          class="w-[8rem] sm:w-[12rem] text-center bg-white border border-slate-200 rounded p-2 sm:p-3"
+          class="w-[7rem] sm:w-[12rem] text-center bg-white border border-slate-200 rounded p-2 sm:p-3"
         >
           <div class="relative w-fit mx-auto">
             <div>
               <!-- Project Icon -->
               <div v-if="record.providerPlanName">
-                <ProjectIcon
+                <router-link
-                  :entity-id="record.providerPlanName"
+                  :to="{
-                  :icon-size="48"
+                    path:
-                  class="rounded size-[3rem] sm:size-[4rem] *:w-full *:h-full"
+                      '/project/' +
-                />
+                      encodeURIComponent(record.providerPlanHandleId || ''),
+                  }"
+                  title="View project details"
+                >
+                  <ProjectIcon
+                    :entity-id="record.providerPlanHandleId || ''"
+                    :icon-size="48"
+                    class="rounded size-[3rem] sm:size-[4rem] *:w-full *:h-full"
+                  />
+                </router-link>
               </div>
               <!-- Identicon for DIDs -->
               <div v-else-if="record.agentDid">
-                <EntityIcon
+                <router-link
-                  :entity-id="record.agentDid"
+                  v-if="!isHiddenDid(record.agentDid)"
-                  :profile-image-url="record.issuer.profileImageUrl"
+                  :to="{
-                  class="rounded-full bg-slate-100 overflow-hidden !size-[3rem] sm:!size-[4rem]"
+                    path: '/did/' + encodeURIComponent(record.agentDid),
+                  }"
+                  title="More details about this person"
+                >
+                  <EntityIcon
+                    :entity-id="record.agentDid"
+                    :profile-image-url="record.issuer.profileImageUrl"
+                    class="rounded-full bg-slate-100 overflow-hidden !size-[3rem] sm:!size-[4rem]"
+                  />
+                </router-link>
+                <font-awesome
+                  v-else
+                  icon="eye-slash"
+                  class="text-slate-300 !size-[3rem] sm:!size-[4rem]"
+                  @click="notifyHiddenPerson"
                 />
               </div>
               <!-- Unknown Person -->
@@ -92,6 +138,7 @@
                 <font-awesome
                   icon="person-circle-question"
                   class="text-slate-300 text-[3rem] sm:text-[4rem]"
+                  @click="notifyUnknownPerson"
                 />
               </div>
             </div>
@@ -110,9 +157,11 @@
 
         <!-- Arrow -->
         <div
-          class="absolute inset-x-[8rem] sm:inset-x-[12rem] mx-2 top-1/2 -translate-y-1/2"
+          class="absolute inset-x-[7rem] sm:inset-x-[12rem] mx-2 top-1/2 -translate-y-1/2"
         >
-          <div class="text-sm text-center leading-none font-semibold pe-[15px]">
+          <div
+            class="text-sm text-center leading-none font-semibold pe-2 sm:pe-4"
+          >
             {{ fetchAmount }}
           </div>
 
@@ -129,24 +178,47 @@
 
         <!-- Destination -->
         <div
-          class="w-[8rem] sm:w-[12rem] text-center bg-white border border-slate-200 rounded p-2 sm:p-3"
+          class="w-[7rem] sm:w-[12rem] text-center bg-white border border-slate-200 rounded p-2 sm:p-3"
         >
           <div class="relative w-fit mx-auto">
             <div>
               <!-- Project Icon -->
               <div v-if="record.recipientProjectName">
-                <ProjectIcon
+                <router-link
-                  :entity-id="record.recipientProjectName"
+                  :to="{
-                  :icon-size="48"
+                    path:
-                  class="rounded size-[3rem] sm:size-[4rem] *:w-full *:h-full"
+                      '/project/' +
-                />
+                      encodeURIComponent(record.fulfillsPlanHandleId || ''),
+                  }"
+                  title="View project details"
+                >
+                  <ProjectIcon
+                    :entity-id="record.fulfillsPlanHandleId || ''"
+                    :icon-size="48"
+                    class="rounded size-[3rem] sm:size-[4rem] *:w-full *:h-full"
+                  />
+                </router-link>
               </div>
               <!-- Identicon for DIDs -->
               <div v-else-if="record.recipientDid">
-                <EntityIcon
+                <router-link
-                  :entity-id="record.recipientDid"
+                  v-if="!isHiddenDid(record.recipientDid)"
-                  :profile-image-url="record.receiver.profileImageUrl"
+                  :to="{
-                  class="rounded-full bg-slate-100 overflow-hidden !size-[3rem] sm:!size-[4rem]"
+                    path: '/did/' + encodeURIComponent(record.recipientDid),
+                  }"
+                  title="More details about this person"
+                >
+                  <EntityIcon
+                    :entity-id="record.recipientDid"
+                    :profile-image-url="record.receiver.profileImageUrl"
+                    class="rounded-full bg-slate-100 overflow-hidden !size-[3rem] sm:!size-[4rem]"
+                  />
+                </router-link>
+                <font-awesome
+                  v-else
+                  icon="eye-slash"
+                  class="text-slate-300 !size-[3rem] sm:!size-[4rem]"
+                  @click="notifyHiddenPerson"
                 />
               </div>
               <!-- Unknown Person -->
@@ -154,6 +226,7 @@
                 <font-awesome
                   icon="person-circle-question"
                   class="text-slate-300 text-[3rem] sm:text-[4rem]"
+                  @click="notifyUnknownPerson"
                 />
               </div>
             </div>
@@ -170,13 +243,6 @@
           </div>
         </div>
       </div>
-
-      <!-- Description -->
-      <p class="font-medium">
-        <a class="cursor-pointer" @click="$emit('loadClaim', record.jwtId)">
-          {{ description }}
-        </a>
-      </p>
     </div>
   </li>
 </template>
@@ -186,8 +252,9 @@ import { Component, Prop, Vue, Emit } from "vue-facing-decorator";
 import { GiveRecordWithContactInfo } from "../types";
 import EntityIcon from "./EntityIcon.vue";
 import { isGiveClaimType, notifyWhyCannotConfirm } from "../libs/util";
-import { containsHiddenDid } from "../libs/endorserServer";
+import { containsHiddenDid, isHiddenDid } from "../libs/endorserServer";
 import ProjectIcon from "./ProjectIcon.vue";
+import { NotificationIface } from "../constants/app";
 
 @Component({
   components: {
@@ -202,6 +269,33 @@ export default class ActivityListItem extends Vue {
   @Prop() activeDid!: string;
   @Prop() confirmerIdList?: string[];
 
+  isHiddenDid = isHiddenDid;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
+
+  notifyHiddenPerson() {
+    this.$notify(
+      {
+        group: "alert",
+        type: "warning",
+        title: "Person Outside Your Network",
+        text: "This person is not visible to you.",
+      },
+      3000,
+    );
+  }
+
+  notifyUnknownPerson() {
+    this.$notify(
+      {
+        group: "alert",
+        type: "warning",
+        title: "Unidentified Person",
+        text: "Nobody specific was recognized.",
+      },
+      3000,
+    );
+  }
+
   @Emit()
   cacheImage(image: string) {
     return image;
@@ -222,7 +316,7 @@ export default class ActivityListItem extends Vue {
     const claim =
       (this.record.fullClaim as unknown).claim || this.record.fullClaim;
 
-    return `${claim.description}`;
+    return `${claim?.description || ""}`;
   }
 
   private displayAmount(code: string, amt: number) {

src/components/DataExportSection.vue

@@ -24,9 +24,7 @@ backup and database export, with platform-specific download instructions. * *
       class="block w-full text-center text-md bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
       @click="exportDatabase()"
     >
-      Download Settings & Contacts
+      Download Contacts
-      <br />
-      (excluding Identifier Data)
     </button>
     <a
       ref="downloadLink"
@@ -52,8 +50,8 @@ backup and database export, with platform-specific download instructions. * *
           v-if="platformCapabilities.isMobile && !platformCapabilities.isIOS"
           class="list-disc list-outside ml-4"
         >
-          On Android: You will be prompted to choose a location to save your
+          On Android: You will be prompted to choose an app for sharing your
-          backup file.
+          backup file. To save on your phone, you will need a file manager app.
         </li>
       </ul>
     </div>
@@ -62,14 +60,18 @@ backup and database export, with platform-specific download instructions. * *
 
 <script lang="ts">
 import { Component, Prop, Vue } from "vue-facing-decorator";
-import { AppString, NotificationIface, USE_DEXIE_DB } from "../constants/app";
+import { AppString, NotificationIface } from "../constants/app";
-import { db } from "../db/index";
+
+import { Contact } from "../db/tables/contacts";
+import * as databaseUtil from "../db/databaseUtil";
+
 import { logger } from "../utils/logger";
 import { PlatformServiceFactory } from "../services/PlatformServiceFactory";
 import {
   PlatformService,
   PlatformCapabilities,
 } from "../services/PlatformService";
+import { contactsToExportJson } from "../libs/util";
 
 /**
  * @vue-component
@@ -131,24 +133,25 @@ export default class DataExportSection extends Vue {
    */
   public async exportDatabase() {
     try {
-      if (!USE_DEXIE_DB) {
+      let allContacts: Contact[] = [];
-        throw new Error("Not implemented");
+      const platformService = PlatformServiceFactory.getInstance();
+      const result = await platformService.dbQuery(`SELECT * FROM contacts`);
+      if (result) {
+        allContacts = databaseUtil.mapQueryResultToValues(
+          result,
+        ) as unknown as Contact[];
       }
-      const blob = await db.export({
+      // if (USE_DEXIE_DB) {
-        prettyJson: true,
+      //   await db.open();
-        transform: (table, value, key) => {
+      //   allContacts = await db.contacts.toArray();
-          if (table === "contacts") {
+      // }
-            // Dexie inserts a number 0 when some are undefined, so we need to totally remove them.
+
-            Object.keys(value).forEach((prop) => {
+      // Convert contacts to export format
-              if (value[prop] === undefined) {
+      const exportData = contactsToExportJson(allContacts);
-                delete value[prop];
+      const jsonStr = JSON.stringify(exportData, null, 2);
-              }
+      const blob = new Blob([jsonStr], { type: "application/json" });
-            });
+
-          }
+      const fileName = `${AppString.APP_NAME_NO_SPACES}-backup-contacts.json`;
-          return { value, key };
-        },
-      });
-      const fileName = `${AppString.APP_NAME_NO_SPACES}-backup.json`;
 
       if (this.platformCapabilities.hasFileDownload) {
         // Web platform: Use download link
@@ -160,8 +163,7 @@ export default class DataExportSection extends Vue {
         setTimeout(() => URL.revokeObjectURL(this.downloadUrl), 1000);
       } else if (this.platformCapabilities.hasFileSystem) {
         // Native platform: Write to app directory
-        const content = await blob.text();
+        await this.platformService.writeAndShareFile(fileName, jsonStr);
-        await this.platformService.writeAndShareFile(fileName, content);
       } else {
         throw new Error("This platform does not support file downloads.");
       }
@@ -172,10 +174,10 @@ export default class DataExportSection extends Vue {
           type: "success",
           title: "Export Successful",
           text: this.platformCapabilities.hasFileDownload
-            ? "See your downloads directory for the backup. It is in the Dexie format."
+            ? "See your downloads directory for the backup."
-            : "You should have been prompted to save your backup file.",
+            : "The backup file has been saved.",
         },
-        -1,
+        3000,
       );
     } catch (error) {
       logger.error("Export Error:", error);

src/components/FeedFilters.vue

@@ -104,7 +104,6 @@ import { USE_DEXIE_DB } from "@/constants/app";
 import * as databaseUtil from "../db/databaseUtil";
 import { MASTER_SETTINGS_KEY } from "../db/tables/settings";
 import { db, retrieveSettingsForActiveAccount } from "../db/index";
-import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
 
 @Component({
   components: {
@@ -143,19 +142,23 @@ export default class FeedFilters extends Vue {
   async toggleHasVisibleDid() {
     this.settingChanged = true;
     this.hasVisibleDid = !this.hasVisibleDid;
-    await db.settings.update(MASTER_SETTINGS_KEY, {
+    await databaseUtil.updateDefaultSettings({
       filterFeedByVisible: this.hasVisibleDid,
     });
+
+    if (USE_DEXIE_DB) {
+      await db.settings.update(MASTER_SETTINGS_KEY, {
+        filterFeedByVisible: this.hasVisibleDid,
+      });
+    }
   }
 
   async toggleNearby() {
     this.settingChanged = true;
     this.isNearby = !this.isNearby;
-    const platformService = PlatformServiceFactory.getInstance();
+    await databaseUtil.updateDefaultSettings({
-    await platformService.dbExec(
+      filterFeedByNearby: this.isNearby,
-      `UPDATE settings SET filterFeedByNearby = ? WHERE id = ?`,
+    });
-      [this.isNearby, MASTER_SETTINGS_KEY],
-    );
 
     if (USE_DEXIE_DB) {
       await db.settings.update(MASTER_SETTINGS_KEY, {
@@ -169,11 +172,10 @@ export default class FeedFilters extends Vue {
       this.settingChanged = true;
     }
 
-    const platformService = PlatformServiceFactory.getInstance();
+    await databaseUtil.updateDefaultSettings({
-    await platformService.dbExec(
+      filterFeedByNearby: false,
-      `UPDATE settings SET filterFeedByNearby = ? AND filterFeedByVisible = ? WHERE id = ?`,
+      filterFeedByVisible: false,
-      [false, false, MASTER_SETTINGS_KEY],
+    });
-    );
 
     if (USE_DEXIE_DB) {
       await db.settings.update(MASTER_SETTINGS_KEY, {
@@ -191,11 +193,10 @@ export default class FeedFilters extends Vue {
       this.settingChanged = true;
     }
 
-    const platformService = PlatformServiceFactory.getInstance();
+    await databaseUtil.updateDefaultSettings({
-    await platformService.dbExec(
+      filterFeedByNearby: true,
-      `UPDATE settings SET filterFeedByNearby = ? AND filterFeedByVisible = ? WHERE id = ?`,
+      filterFeedByVisible: true,
-      [true, true, MASTER_SETTINGS_KEY],
+    });
-    );
 
     if (USE_DEXIE_DB) {
       await db.settings.update(MASTER_SETTINGS_KEY, {

src/components/GiftedDialog.vue

@@ -320,11 +320,8 @@ export default class GiftedDialog extends Vue {
         this.fromProjectId,
       );
 
-      if (
+      if (!result.success) {
-        result.type === "error" ||
+        const errorMessage = result.error;
-        this.isGiveCreationError(result.response)
-      ) {
-        const errorMessage = this.getGiveCreationErrorMessage(result);
         logger.error("Error with give creation result:", result);
         this.$notify(
           {
@@ -370,28 +367,6 @@ export default class GiftedDialog extends Vue {
 
   // Helper functions for readability
 
-  /**
-   * @param result response "data" from the server
-   * @returns true if the result indicates an error
-   */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  isGiveCreationError(result: any) {
-    return result.status !== 201 || result.data?.error;
-  }
-
-  /**
-   * @param result direct response eg. ErrorResult or SuccessResult (potentially with embedded "data")
-   * @returns best guess at an error message
-   */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  getGiveCreationErrorMessage(result: any) {
-    return (
-      result.error?.userMessage ||
-      result.error?.error ||
-      result.response?.data?.error?.message
-    );
-  }
-
   explainData() {
     this.$notify(
       {

src/components/GiftedPrompts.vue

@@ -227,6 +227,7 @@ export default class GivenPrompts extends Vue {
 
     let someContactDbIndex = Math.floor(Math.random() * this.numContacts);
     let count = 0;
+
     // as long as the index has an entry, loop
     while (
       this.shownContactDbIndices[someContactDbIndex] != null &&
@@ -245,9 +246,8 @@ export default class GivenPrompts extends Vue {
         [someContactDbIndex],
       );
       if (result) {
-        this.currentContact = databaseUtil.mapQueryResultToValues(result)[
+        const mappedContacts = databaseUtil.mapQueryResultToValues(result);
-          someContactDbIndex
+        this.currentContact = mappedContacts[0] as unknown as Contact;
-        ] as unknown as Contact;
       }
       if (USE_DEXIE_DB) {
         await db.open();

src/components/HiddenDidDialog.vue

@@ -48,16 +48,15 @@
                   <span>
                     {{ didInfo(visDid) }}
                     <span v-if="!serverUtil.isEmptyOrHiddenDid(visDid)">
-                      <a
+                      <router-link
-                        :href="`/did/${visDid}`"
+                        :to="{ path: '/did/' + encodeURIComponent(visDid) }"
-                        target="_blank"
                         class="text-blue-500"
                       >
                         <font-awesome
                           icon="arrow-up-right-from-square"
                           class="fa-fw"
                         />
-                      </a>
+                      </router-link>
                     </span>
                   </span>
                 </div>
@@ -78,7 +77,7 @@
             If you'd like an introduction,
             <a
               class="text-blue-500"
-              @click="copyToClipboard('A link to this page', windowLocation)"
+              @click="copyToClipboard('A link to this page', deepLinkUrl)"
               >click here to copy this page, paste it into a message, and ask if
               they'll tell you more about the {{ roleName }}.</a
             >
@@ -105,7 +104,7 @@ import * as R from "ramda";
 import { useClipboard } from "@vueuse/core";
 import { Contact } from "../db/tables/contacts";
 import * as serverUtil from "../libs/endorserServer";
-import { NotificationIface } from "../constants/app";
+import { APP_SERVER, NotificationIface } from "../constants/app";
 
 @Component
 export default class HiddenDidDialog extends Vue {
@@ -118,7 +117,8 @@ export default class HiddenDidDialog extends Vue {
   activeDid = "";
   allMyDids: Array<string> = [];
   canShare = false;
-  windowLocation = window.location.href;
+  deepLinkPathSuffix = "";
+  deepLinkUrl = window.location.href; // this is changed to a deep link in the setup
 
   R = R;
   serverUtil = serverUtil;
@@ -130,17 +130,21 @@ export default class HiddenDidDialog extends Vue {
   }
 
   open(
+    deepLinkPathSuffix: string,
     roleName: string,
     visibleToDids: string[],
     allContacts: Array<Contact>,
     activeDid: string,
     allMyDids: Array<string>,
   ) {
+    this.deepLinkPathSuffix = deepLinkPathSuffix;
     this.roleName = roleName;
     this.visibleToDids = visibleToDids;
     this.allContacts = allContacts;
     this.activeDid = activeDid;
     this.allMyDids = allMyDids;
+
+    this.deepLinkUrl = APP_SERVER + "/deep-link/" + this.deepLinkPathSuffix;
     this.isOpen = true;
   }
 
@@ -174,11 +178,11 @@ export default class HiddenDidDialog extends Vue {
   }
 
   onClickShareClaim() {
-    this.copyToClipboard("A link to this page", this.windowLocation);
+    this.copyToClipboard("A link to this page", this.deepLinkUrl);
     window.navigator.share({
       title: "Help Connect Me",
       text: "I'm trying to find the people who recorded this. Can you help me?",
-      url: this.windowLocation,
+      url: this.deepLinkUrl,
     });
   }
 }

src/components/IconRenderer.vue

@@ -0,0 +1,90 @@
+<template>
+  <svg
+    v-if="iconData"
+    :class="svgClass"
+    :fill="fill"
+    :stroke="stroke"
+    :viewBox="viewBox"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path v-for="(path, index) in iconData.paths" :key="index" v-bind="path" />
+  </svg>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from "vue-facing-decorator";
+import icons from "../assets/icons.json";
+import { logger } from "../utils/logger";
+
+/**
+ * Icon path interface
+ */
+interface IconPath {
+  d: string;
+  fillRule?: string;
+  clipRule?: string;
+  strokeLinecap?: string;
+  strokeLinejoin?: string;
+  strokeWidth?: string | number;
+  fill?: string;
+  stroke?: string;
+}
+
+/**
+ * Icon data interface
+ */
+interface IconData {
+  paths: IconPath[];
+}
+
+/**
+ * Icons JSON structure
+ */
+interface IconsJson {
+  [key: string]: IconPath | IconData;
+}
+
+/**
+ * Icon Renderer Component
+ *
+ * This component loads SVG icon definitions from a JSON file and renders them
+ * as SVG elements. It provides a clean way to use icons without cluttering
+ * templates with long SVG path definitions.
+ *
+ * @author Matthew Raymer
+ * @version 1.0.0
+ * @since 2024
+ */
+@Component({
+  name: "IconRenderer",
+})
+export default class IconRenderer extends Vue {
+  @Prop({ required: true }) readonly iconName!: string;
+  @Prop({ default: "h-5 w-5" }) readonly svgClass!: string;
+  @Prop({ default: "none" }) readonly fill!: string;
+  @Prop({ default: "currentColor" }) readonly stroke!: string;
+  @Prop({ default: "0 0 24 24" }) readonly viewBox!: string;
+
+  /**
+   * Get the icon data for the specified icon name
+   *
+   * @returns {IconData | null} The icon data object or null if not found
+   */
+  get iconData(): IconData | null {
+    const icon = (icons as IconsJson)[this.iconName];
+    if (!icon) {
+      logger.warn(`Icon "${this.iconName}" not found in icons.json`);
+      return null;
+    }
+
+    // Convert single path to array format for consistency
+    if ("d" in icon) {
+      return {
+        paths: [icon as IconPath],
+      };
+    }
+
+    return icon as IconData;
+  }
+}
+</script>

src/components/ImageMethodDialog.vue

@@ -4,7 +4,9 @@
       <div class="text-lg text-center font-bold relative">
         <h1 id="ViewHeading" class="text-center font-bold">
           <span v-if="uploading">Uploading Image&hellip;</span>
-          <span v-else-if="blob">Crop Image</span>
+          <span v-else-if="blob">{{
+            crop ? "Crop Image" : "Preview Image"
+          }}</span>
           <span v-else-if="showCameraPreview">Upload Image</span>
           <span v-else>Add Photo</span>
         </h1>
@@ -119,12 +121,23 @@
                   playsinline
                   muted
                 ></video>
-                <button
+                <div
-                  class="absolute bottom-4 left-1/2 -translate-x-1/2 bg-white text-slate-800 p-3 rounded-full text-2xl leading-none"
+                  class="absolute bottom-4 inset-x-0 flex items-center justify-center gap-4"
-                  @click="capturePhoto"
                 >
-                  <font-awesome icon="camera" class="w-[1em]" />
+                  <button
-                </button>
+                    class="bg-white text-slate-800 p-3 rounded-full text-2xl leading-none"
+                    @click="capturePhoto"
+                  >
+                    <font-awesome icon="camera" class="w-[1em]" />
+                  </button>
+                  <button
+                    v-if="platformCapabilities.isMobile"
+                    class="bg-white text-slate-800 p-3 rounded-full text-2xl leading-none"
+                    @click="rotateCamera"
+                  >
+                    <font-awesome icon="rotate" class="w-[1em]" />
+                  </button>
+                </div>
               </div>
             </div>
             <div
@@ -229,12 +242,12 @@
             <p class="mb-2">
               Before you can upload a photo, a friend needs to register you.
             </p>
-            <router-link
+            <button
-              :to="{ name: 'contact-qr' }"
               class="inline-block text-md uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-4 py-2 rounded-md"
+              @click="handleQRCodeClick"
             >
               Share Your Info
-            </router-link>
+            </button>
           </div>
         </template>
       </div>
@@ -247,6 +260,7 @@ import axios from "axios";
 import { ref } from "vue";
 import { Component, Vue } from "vue-facing-decorator";
 import VuePictureCropper, { cropper } from "vue-picture-cropper";
+import { Capacitor } from "@capacitor/core";
 import {
   DEFAULT_IMAGE_API_SERVER,
   NotificationIface,
@@ -267,6 +281,11 @@ const inputImageFileNameRef = ref<Blob>();
       type: Boolean,
       default: true,
     },
+    defaultCameraMode: {
+      type: String,
+      default: "environment",
+      validator: (value: string) => ["environment", "user"].includes(value),
+    },
   },
 })
 export default class ImageMethodDialog extends Vue {
@@ -308,6 +327,9 @@ export default class ImageMethodDialog extends Vue {
   /** Camera stream reference */
   private cameraStream: MediaStream | null = null;
 
+  /** Current camera facing mode */
+  private currentFacingMode: "environment" | "user" = "environment";
+
   private platformService = PlatformServiceFactory.getInstance();
   URL = window.URL || window.webkitURL;
 
@@ -369,15 +391,16 @@ export default class ImageMethodDialog extends Vue {
   }
 
   open(setImageFn: (arg: string) => void, claimType: string, crop?: boolean) {
+    logger.debug("ImageMethodDialog.open called");
     this.claimType = claimType;
     this.crop = !!crop;
     this.imageCallback = setImageFn;
     this.visible = true;
+    this.currentFacingMode = this.defaultCameraMode as "environment" | "user";
 
-    // Start camera preview immediately if not on mobile
+    // Start camera preview immediately
-    if (!this.platformCapabilities.isNativeApp) {
+    logger.debug("Starting camera preview from open()");
-      this.startCameraPreview();
+    this.startCameraPreview();
-    }
   }
 
   async uploadImageFile(event: Event) {
@@ -446,46 +469,24 @@ export default class ImageMethodDialog extends Vue {
     logger.debug("startCameraPreview called");
     logger.debug("Current showCameraPreview state:", this.showCameraPreview);
     logger.debug("Platform capabilities:", this.platformCapabilities);
+    logger.debug("MediaDevices available:", !!navigator.mediaDevices);
+    logger.debug(
+      "getUserMedia available:",
+      !!(navigator.mediaDevices && navigator.mediaDevices.getUserMedia),
+    );
 
-    if (this.platformCapabilities.isNativeApp) {
-      logger.debug("Using platform service for mobile device");
-      this.cameraState = "initializing";
-      this.cameraStateMessage = "Using platform camera service...";
-      try {
-        const result = await this.platformService.takePicture();
-        this.blob = result.blob;
-        this.fileName = result.fileName;
-        this.cameraState = "ready";
-        this.cameraStateMessage = "Photo captured successfully";
-      } catch (error) {
-        logger.error("Error taking picture:", error);
-        this.cameraState = "error";
-        this.cameraStateMessage =
-          error instanceof Error ? error.message : "Failed to take picture";
-        this.error =
-          error instanceof Error ? error.message : "Failed to take picture";
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "Failed to take picture. Please try again.",
-          },
-          5000,
-        );
-      }
-      return;
-    }
-
-    logger.debug("Starting camera preview for desktop browser");
     try {
       this.cameraState = "initializing";
       this.cameraStateMessage = "Requesting camera access...";
       this.showCameraPreview = true;
       await this.$nextTick();
 
+      if (!navigator.mediaDevices || !navigator.mediaDevices.getUserMedia) {
+        throw new Error("Camera API not available in this browser");
+      }
+
       const stream = await navigator.mediaDevices.getUserMedia({
-        video: { facingMode: "environment" },
+        video: { facingMode: this.currentFacingMode },
       });
       logger.debug("Camera access granted");
       this.cameraStream = stream;
@@ -499,25 +500,36 @@ export default class ImageMethodDialog extends Vue {
         videoElement.srcObject = stream;
         await new Promise((resolve) => {
           videoElement.onloadedmetadata = () => {
-            videoElement.play().then(() => {
+            videoElement
-              resolve(true);
+              .play()
-            });
+              .then(() => {
+                logger.debug("Video element started playing");
+                resolve(true);
+              })
+              .catch((error) => {
+                logger.error("Error playing video:", error);
+                throw error;
+              });
           };
         });
+      } else {
+        logger.error("Video element not found");
+        throw new Error("Video element not found");
       }
     } catch (error) {
       logger.error("Error starting camera preview:", error);
       let errorMessage =
         error instanceof Error ? error.message : "Failed to access camera";
       if (
-        error.name === "NotReadableError" ||
+        error instanceof Error &&
-        error.name === "TrackStartError"
+        (error.name === "NotReadableError" || error.name === "TrackStartError")
       ) {
         errorMessage =
           "Camera is in use by another application. Please close any other apps or browser tabs using the camera and try again.";
       } else if (
-        error.name === "NotAllowedError" ||
+        error instanceof Error &&
-        error.name === "PermissionDeniedError"
+        (error.name === "NotAllowedError" ||
+          error.name === "PermissionDeniedError")
       ) {
         errorMessage =
           "Camera access was denied. Please allow camera access in your browser settings.";
@@ -525,6 +537,7 @@ export default class ImageMethodDialog extends Vue {
       this.cameraState = "error";
       this.cameraStateMessage = errorMessage;
       this.error = errorMessage;
+      this.showCameraPreview = false;
       this.$notify(
         {
           group: "alert",
@@ -534,7 +547,6 @@ export default class ImageMethodDialog extends Vue {
         },
         5000,
       );
-      this.showCameraPreview = false;
     }
   }
 
@@ -586,6 +598,21 @@ export default class ImageMethodDialog extends Vue {
     }
   }
 
+  async rotateCamera() {
+    // Toggle between front and back cameras
+    this.currentFacingMode =
+      this.currentFacingMode === "environment" ? "user" : "environment";
+
+    // Stop current stream
+    if (this.cameraStream) {
+      this.cameraStream.getTracks().forEach((track) => track.stop());
+      this.cameraStream = null;
+    }
+
+    // Start new stream with updated facing mode
+    await this.startCameraPreview();
+  }
+
   private createBlobURL(blob: Blob): string {
     return URL.createObjectURL(blob);
   }
@@ -620,6 +647,7 @@ export default class ImageMethodDialog extends Vue {
         5000,
       );
       this.uploading = false;
+      this.close();
       return;
     }
     formData.append("image", this.blob, this.fileName || "photo.jpg");
@@ -674,6 +702,7 @@ export default class ImageMethodDialog extends Vue {
       );
       this.uploading = false;
       this.blob = undefined;
+      this.close();
     }
   }
 
@@ -681,6 +710,14 @@ export default class ImageMethodDialog extends Vue {
   toggleDiagnostics() {
     this.showDiagnostics = !this.showDiagnostics;
   }
+
+  private handleQRCodeClick() {
+    if (Capacitor.isNativePlatform()) {
+      this.$router.push({ name: "contact-qr-scan-full" });
+    } else {
+      this.$router.push({ name: "contact-qr" });
+    }
+  }
 }
 </script>
 

src/components/MembersList.vue

@@ -301,7 +301,7 @@ export default class MembersList extends Vue {
         this.decryptedMembers.length === 0 ||
         this.decryptedMembers[0].member.memberId !== this.members[0].memberId
       ) {
-        return "Your password is not the same as the organizer. Reload or have them check their password.";
+        return "Your password is not the same as the organizer. Retry or have them check their password.";
       } else {
         // the first (organizer) member was decrypted OK
         return "";
@@ -342,7 +342,7 @@ export default class MembersList extends Vue {
           group: "alert",
           type: "info",
           title: "Contact Exists",
-          text: "They are in your contacts. If you want to remove them, you must do that from the contacts screen.",
+          text: "They are in your contacts. To remove them, use the contacts page.",
         },
         10000,
       );
@@ -352,7 +352,7 @@ export default class MembersList extends Vue {
           group: "alert",
           type: "info",
           title: "Contact Available",
-          text: "This is to add them to your contacts. If you want to remove them later, you must do that from the contacts screen.",
+          text: "This is to add them to your contacts. To remove them later, use the contacts page.",
         },
         10000,
       );

src/components/OfferDialog.vue

@@ -83,10 +83,7 @@
 import { Vue, Component, Prop } from "vue-facing-decorator";
 
 import { NotificationIface, USE_DEXIE_DB } from "../constants/app";
-import {
+import { createAndSubmitOffer } from "../libs/endorserServer";
-  createAndSubmitOffer,
-  serverMessageForUser,
-} from "../libs/endorserServer";
 import * as libsUtil from "../libs/util";
 import * as databaseUtil from "../db/databaseUtil";
 import { retrieveSettingsForActiveAccount } from "../db/index";
@@ -249,11 +246,8 @@ export default class OfferDialog extends Vue {
         this.projectId,
       );
 
-      if (
+      if (!result.success) {
-        result.type === "error" ||
+        const errorMessage = result.error;
-        this.isOfferCreationError(result.response)
-      ) {
-        const errorMessage = this.getOfferCreationErrorMessage(result);
         logger.error("Error with offer creation result:", result);
         this.$notify(
           {
@@ -293,30 +287,6 @@ export default class OfferDialog extends Vue {
       );
     }
   }
-
-  // Helper functions for readability
-
-  /**
-   * @param result response "data" from the server
-   * @returns true if the result indicates an error
-   */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  isOfferCreationError(result: any) {
-    return result.status !== 201 || result.data?.error;
-  }
-
-  /**
-   * @param result direct response eg. ErrorResult or SuccessResult (potentially with embedded "data")
-   * @returns best guess at an error message
-   */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  getOfferCreationErrorMessage(result: any) {
-    return (
-      serverMessageForUser(result) ||
-      result.error?.userMessage ||
-      result.error?.error
-    );
-  }
 }
 </script>
 

src/components/OnboardingDialog.vue

@@ -5,7 +5,7 @@
       <h1 class="text-xl font-bold text-center mb-4 relative">
         Welcome to Time Safari
         <br />
-        - Showcasing Gratitude & Magnifying Time
+        - Showcase Impact & Magnify Time
         <div
           class="text-lg text-center leading-none absolute right-0 -top-1"
           @click="onClickClose(true)"
@@ -14,6 +14,9 @@
         </div>
       </h1>
 
+      The feed underneath this pop-up shows the latest contributions, some from
+      people and some from projects.
+
       <p v-if="isRegistered" class="mt-4">
         You can now log things that you've seen:
         <span v-if="numContacts > 0">
@@ -23,14 +26,10 @@
         <span class="bg-green-600 text-white rounded-full">
           <font-awesome icon="plus" class="fa-fw" />
         </span>
-        button to express your appreciation for... whatever -- maybe thanks for
+        button to express your appreciation for... whatever.
-        showing you all these fascinating stories of
-        <em>gratitude</em>.
       </p>
-      <p v-else class="mt-4">
+      <p class="mt-4">
-        The feed underneath this pop-up shows the latest gifts that others have
+        Once someone registers you, you can log your appreciation, too.
-        recognized. Once someone registers you, you can log your appreciation,
-        too.
       </p>
 
       <p class="mt-4">
@@ -260,7 +259,7 @@ export default class OnboardingDialog extends Vue {
     this.visible = true;
     if (this.page === OnboardPage.Create) {
       // we'll assume that they've been through all the other pages
-      await databaseUtil.updateAccountSettings(this.activeDid, {
+      await databaseUtil.updateDidSpecificSettings(this.activeDid, {
         finishedOnboarding: true,
       });
       if (USE_DEXIE_DB) {
@@ -274,7 +273,7 @@ export default class OnboardingDialog extends Vue {
   async onClickClose(done?: boolean, goHome?: boolean) {
     this.visible = false;
     if (done) {
-      await databaseUtil.updateAccountSettings(this.activeDid, {
+      await databaseUtil.updateDidSpecificSettings(this.activeDid, {
         finishedOnboarding: true,
       });
       if (USE_DEXIE_DB) {

src/components/ProjectIcon.vue

@@ -1,18 +1,14 @@
 <!-- eslint-disable vue/no-v-html -->
 <template>
   <a
-    v-if="linkToFull && imageUrl"
+    v-if="linkToFullImage && imageUrl"
     :href="imageUrl"
     target="_blank"
     class="h-full w-full object-contain"
   >
-    <div class="h-full w-full object-contain" v-html="generateIdenticon()" />
+    <div class="h-full w-full object-contain" v-html="generateIcon()" />
   </a>
-  <div
+  <div v-else class="h-full w-full object-contain" v-html="generateIcon()" />
-    v-else
-    class="h-full w-full object-contain"
-    v-html="generateIdenticon()"
-  />
 </template>
 <script lang="ts">
 import { toSvg } from "jdenticon";
@@ -35,9 +31,9 @@ export default class ProjectIcon extends Vue {
   @Prop entityId = "";
   @Prop iconSize = 0;
   @Prop imageUrl = "";
-  @Prop linkToFull = false;
+  @Prop linkToFullImage = false;
 
-  generateIdenticon() {
+  generateIcon() {
     if (this.imageUrl) {
       return `<img src="${this.imageUrl}" class="w-full h-full object-contain" />`;
     } else {

src/components/TopMessage.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="absolute right-5 top-[calc(env(safe-area-inset-top)+0.75rem)]">
+  <div class="absolute right-5 top-[max(0.75rem,env(safe-area-inset-top))]">
     <span class="align-center text-red-500 mr-2">{{ message }}</span>
     <span class="ml-2">
       <router-link
@@ -38,14 +38,13 @@ export default class TopMessage extends Vue {
         settings.apiServer !== AppString.PROD_ENDORSER_API_SERVER
       ) {
         const didPrefix = settings.activeDid?.slice(11, 15);
-        this.message = "You're linked to a non-prod server, user " + didPrefix;
+        this.message = "You're not using prod, user " + didPrefix;
       } else if (
         settings.warnIfProdServer &&
         settings.apiServer === AppString.PROD_ENDORSER_API_SERVER
       ) {
         const didPrefix = settings.activeDid?.slice(11, 15);
-        this.message =
+        this.message = "You are using prod, user " + didPrefix;
-          "You're linked to the production server, user " + didPrefix;
       }
     } catch (err: unknown) {
       this.$notify(

src/components/UserNameDialog.vue

@@ -74,7 +74,7 @@ export default class UserNameDialog extends Vue {
   async onClickSaveChanges() {
     const platformService = PlatformServiceFactory.getInstance();
     await platformService.dbExec(
-      "UPDATE settings SET firstName = ? WHERE key = ?",
+      "UPDATE settings SET firstName = ? WHERE id = ?",
       [this.givenName, MASTER_SETTINGS_KEY],
     );
     if (USE_DEXIE_DB) {

src/constants/app.ts

@@ -7,6 +7,7 @@ export enum AppString {
   // This is used in titles and verbiage inside the app.
   // There is also an app name without spaces, for packaging in the package.json file used in the manifest.
   APP_NAME = "Time Safari",
+  // iOS doesn't like spaces in the app title.
   APP_NAME_NO_SPACES = "TimeSafari",
 
   PROD_ENDORSER_API_SERVER = "https://api.endorser.ch",
@@ -33,18 +34,18 @@ export const APP_SERVER =
 
 export const DEFAULT_ENDORSER_API_SERVER =
   import.meta.env.VITE_DEFAULT_ENDORSER_API_SERVER ||
-  AppString.TEST_ENDORSER_API_SERVER;
+  AppString.PROD_ENDORSER_API_SERVER;
 
 export const DEFAULT_IMAGE_API_SERVER =
   import.meta.env.VITE_DEFAULT_IMAGE_API_SERVER ||
-  AppString.TEST_IMAGE_API_SERVER;
+  AppString.PROD_IMAGE_API_SERVER;
 
 export const DEFAULT_PARTNER_API_SERVER =
   import.meta.env.VITE_DEFAULT_PARTNER_API_SERVER ||
-  AppString.TEST_PARTNER_API_SERVER;
+  AppString.PROD_PARTNER_API_SERVER;
 
 export const DEFAULT_PUSH_SERVER =
-  import.meta.env.VITE_DEFAULT_PUSH_SERVER || "https://timesafari.app";
+  import.meta.env.VITE_DEFAULT_PUSH_SERVER || AppString.PROD_PUSH_SERVER;
 
 export const IMAGE_TYPE_PROFILE = "profile";
 

src/db-sql/migration.ts

@@ -1,5 +1,7 @@
-import migrationService from "../services/migrationService";
+import {
-import type { QueryExecResult } from "../interfaces/database";
+  registerMigration,
+  runMigrations as runMigrationsService,
+} from "../services/migrationService";
 import { DEFAULT_ENDORSER_API_SERVER } from "@/constants/app";
 import { arrayBufferToBase64 } from "@/libs/crypto";
 
@@ -27,12 +29,12 @@ import { arrayBufferToBase64 } from "@/libs/crypto";
 
 const randomBytes = crypto.getRandomValues(new Uint8Array(32));
 const secretBase64 = arrayBufferToBase64(randomBytes);
+console.log('secretBase64', secretBase64); // useful while we have multiple DBs activating (at least on web)
 
 // Each migration can include multiple SQL statements (with semicolons)
 const MIGRATIONS = [
   {
     name: "001_initial",
-    // see ../db/tables files for explanations of the fields
     sql: `
       CREATE TABLE IF NOT EXISTS accounts (
         id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -117,18 +119,25 @@ const MIGRATIONS = [
       );
       `,
   },
+  {
+    name: "002_add_iViewContent_to_contacts",
+    sql: `
+      ALTER TABLE contacts ADD COLUMN iViewContent BOOLEAN DEFAULT TRUE;
+    `,
+  },
 ];
 
-export async function registerMigrations(): Promise<void> {
+/**
-  // Register all migrations
+ * @param sqlExec - A function that executes a SQL statement and returns the result
-  for (const migration of MIGRATIONS) {
+ * @param extractMigrationNames - A function that extracts the names (string array) from "select name from migrations"
-    await migrationService.registerMigration(migration);
+ */
-  }
+export async function runMigrations<T>(
-}
+  sqlExec: (sql: string, params?: unknown[]) => Promise<unknown>,
-
+  sqlQuery: (sql: string, params?: unknown[]) => Promise<T>,
-export async function runMigrations(
+  extractMigrationNames: (result: T) => Set<string>,
-  sqlExec: (sql: string, params?: unknown[]) => Promise<Array<QueryExecResult>>,
 ): Promise<void> {
-  await registerMigrations();
+  for (const migration of MIGRATIONS) {
-  await migrationService.runMigrations(sqlExec);
+    registerMigration(migration);
+  }
+  await runMigrationsService(sqlExec, sqlQuery, extractMigrationNames);
 }

src/db/databaseUtil.ts

@@ -37,7 +37,20 @@ export async function updateDefaultSettings(
   }
 }
 
-export async function updateAccountSettings(
+export async function insertDidSpecificSettings(
+  did: string,
+  settings: Partial<Settings> = {},
+): Promise<boolean> {
+  const platform = PlatformServiceFactory.getInstance();
+  const { sql, params } = generateInsertStatement(
+    { ...settings, accountDid: did }, // make sure accountDid is set to the given value
+    "settings",
+  );
+  const result = await platform.dbExec(sql, params);
+  return result.changes === 1;
+}
+
+export async function updateDidSpecificSettings(
   accountDid: string,
   settingsChanges: Settings,
 ): Promise<boolean> {
@@ -55,20 +68,7 @@ export async function updateAccountSettings(
   );
 
   const updateResult = await platform.dbExec(updateSql, updateParams);
-
+  return updateResult.changes === 1;
-  // If no record was updated, insert a new one
-  if (updateResult.changes === 1) {
-    return true;
-  } else {
-    const columns = Object.keys(settingsChanges);
-    const values = Object.values(settingsChanges);
-    const placeholders = values.map(() => "?").join(", ");
-
-    const insertSql = `INSERT INTO settings (${columns.join(", ")}) VALUES (${placeholders})`;
-    const result = await platform.dbExec(insertSql, values);
-
-    return result.changes === 1;
-  }
 }
 
 const DEFAULT_SETTINGS: Settings = {
@@ -80,9 +80,8 @@ const DEFAULT_SETTINGS: Settings = {
 // retrieves default settings
 export async function retrieveSettingsForDefaultAccount(): Promise<Settings> {
   const platform = PlatformServiceFactory.getInstance();
-  const result = await platform.dbQuery("SELECT * FROM settings WHERE id = ?", [
+  const sql = "SELECT * FROM settings WHERE id = ?";
-    MASTER_SETTINGS_KEY,
+  const result = await platform.dbQuery(sql, [MASTER_SETTINGS_KEY]);
-  ]);
   if (!result) {
     return DEFAULT_SETTINGS;
   } else {
@@ -98,32 +97,77 @@ export async function retrieveSettingsForDefaultAccount(): Promise<Settings> {
   }
 }
 
+/**
+ * Retrieves settings for the active account, merging with default settings
+ *
+ * @returns Promise<Settings> Combined settings with account-specific overrides
+ * @throws Will log specific errors for debugging but returns default settings on failure
+ */
 export async function retrieveSettingsForActiveAccount(): Promise<Settings> {
-  const defaultSettings = await retrieveSettingsForDefaultAccount();
+  try {
-  if (!defaultSettings.activeDid) {
+    // Get default settings first
-    return defaultSettings;
+    const defaultSettings = await retrieveSettingsForDefaultAccount();
-  } else {
+    // If no active DID, return defaults
-    const platform = PlatformServiceFactory.getInstance();
+    if (!defaultSettings.activeDid) {
-    const result = await platform.dbQuery(
+      return defaultSettings;
-      "SELECT * FROM settings WHERE accountDid = ?",
-      [defaultSettings.activeDid],
-    );
-    const overrideSettings = result
-      ? (mapColumnsToValues(result.columns, result.values)[0] as Settings)
-      : {};
-    const overrideSettingsFiltered = Object.fromEntries(
-      Object.entries(overrideSettings).filter(([_, v]) => v !== null),
-    );
-    const settings = { ...defaultSettings, ...overrideSettingsFiltered };
-    if (settings.searchBoxes) {
-      // @ts-expect-error - the searchBoxes field is a string in the DB
-      settings.searchBoxes = JSON.parse(settings.searchBoxes);
     }
-    return settings;
+
+    // Get account-specific settings
+    try {
+      const platform = PlatformServiceFactory.getInstance();
+      const result = await platform.dbQuery(
+        "SELECT * FROM settings WHERE accountDid = ?",
+        [defaultSettings.activeDid],
+      );
+
+      if (!result?.values?.length) {
+        // we created DID-specific settings when generated or imported, so this shouldn't happen
+        return defaultSettings;
+      }
+
+      // Map and filter settings
+      const overrideSettings = mapColumnsToValues(
+        result.columns,
+        result.values,
+      )[0] as Settings;
+
+      const overrideSettingsFiltered = Object.fromEntries(
+        Object.entries(overrideSettings).filter(([_, v]) => v !== null),
+      );
+
+      // Merge settings
+      const settings = { ...defaultSettings, ...overrideSettingsFiltered };
+
+      // Handle searchBoxes parsing
+      if (settings.searchBoxes) {
+        settings.searchBoxes = parseJsonField(settings.searchBoxes, []);
+      }
+
+      return settings;
+    } catch (error) {
+      logConsoleAndDb(
+        `[databaseUtil] Failed to retrieve account settings for ${defaultSettings.activeDid}: ${error}`,
+        true,
+      );
+      // Return defaults on error
+      return defaultSettings;
+    }
+  } catch (error) {
+    logConsoleAndDb(
+      `[databaseUtil] Failed to retrieve default settings: ${error}`,
+      true,
+    );
+    // Return minimal default settings on complete failure
+    return {
+      id: MASTER_SETTINGS_KEY,
+      activeDid: undefined,
+      apiServer: DEFAULT_ENDORSER_API_SERVER,
+    };
   }
 }
 
 let lastCleanupDate: string | null = null;
+export let memoryLogs: string[] = [];
 
 /**
  * Logs a message to the database with proper handling of concurrent writes
@@ -136,6 +180,7 @@ export async function logToDb(message: string): Promise<void> {
   const nowKey = new Date().toISOString();
 
   try {
+    memoryLogs.push(`${new Date().toISOString()} ${message}`);
     // Try to insert first, if it fails due to UNIQUE constraint, update instead
     await platform.dbExec("INSERT INTO logs (date, message) VALUES (?, ?)", [
       nowKey,
@@ -148,6 +193,9 @@ export async function logToDb(message: string): Promise<void> {
       const sevenDaysAgo = new Date(
         new Date().getTime() - 7 * 24 * 60 * 60 * 1000,
       );
+      memoryLogs = memoryLogs.filter(
+        (log) => log.split(" ")[0] > sevenDaysAgo.toDateString(),
+      );
       await platform.dbExec("DELETE FROM logs WHERE date < ?", [
         sevenDaysAgo.toDateString(),
       ]);
@@ -171,18 +219,36 @@ export async function logConsoleAndDb(
   isError = false,
 ): Promise<void> {
   if (isError) {
-    logger.error(`${new Date().toISOString()} ${message}`);
+    logger.error(`${new Date().toISOString()}`, message);
   } else {
-    logger.log(`${new Date().toISOString()} ${message}`);
+    logger.log(`${new Date().toISOString()}`, message);
   }
   await logToDb(message);
 }
 
 /**
- * Generates an SQL INSERT statement and parameters from a model object.
+ * Generates SQL INSERT statement and parameters from a model object
- * @param model The model object containing fields to update
+ *
- * @param tableName The name of the table to update
+ * This helper function creates a parameterized SQL INSERT statement
- * @returns Object containing the SQL statement and parameters array
+ * from a JavaScript object. It filters out undefined values and
+ * creates the appropriate SQL syntax with placeholders.
+ *
+ * The function is used internally by the migration functions to
+ * safely insert data into the SQLite database.
+ *
+ * @function generateInsertStatement
+ * @param {Record<string, unknown>} model - The model object containing fields to insert
+ * @param {string} tableName - The name of the table to insert into
+ * @returns {Object} Object containing the SQL statement and parameters array
+ * @returns {string} returns.sql - The SQL INSERT statement
+ * @returns {unknown[]} returns.params - Array of parameter values
+ * @example
+ * ```typescript
+ * const contact = { did: 'did:example:123', name: 'John Doe' };
+ * const { sql, params } = generateInsertStatement(contact, 'contacts');
+ * // sql: "INSERT INTO contacts (did, name) VALUES (?, ?)"
+ * // params: ['did:example:123', 'John Doe']
+ * ```
  */
 export function generateInsertStatement(
   model: Record<string, unknown>,
@@ -192,6 +258,7 @@ export function generateInsertStatement(
   const values = Object.values(model).filter((value) => value !== undefined);
   const placeholders = values.map(() => "?").join(", ");
   const insertSql = `INSERT INTO ${tableName} (${columns.join(", ")}) VALUES (${placeholders})`;
+
   return {
     sql: insertSql,
     params: values,
@@ -199,12 +266,30 @@ export function generateInsertStatement(
 }
 
 /**
- * Generates an SQL UPDATE statement and parameters from a model object.
+ * Generates SQL UPDATE statement and parameters from a model object
- * @param model The model object containing fields to update
+ *
- * @param tableName The name of the table to update
+ * This helper function creates a parameterized SQL UPDATE statement
- * @param whereClause The WHERE clause for the update (e.g. "id = ?")
+ * from a JavaScript object. It filters out undefined values and
- * @param whereParams Parameters for the WHERE clause
+ * creates the appropriate SQL syntax with placeholders.
- * @returns Object containing the SQL statement and parameters array
+ *
+ * The function is used internally by the migration functions to
+ * safely update data in the SQLite database.
+ *
+ * @function generateUpdateStatement
+ * @param {Record<string, unknown>} model - The model object containing fields to update
+ * @param {string} tableName - The name of the table to update
+ * @param {string} whereClause - The WHERE clause for the update (e.g. "id = ?")
+ * @param {unknown[]} [whereParams=[]] - Parameters for the WHERE clause
+ * @returns {Object} Object containing the SQL statement and parameters array
+ * @returns {string} returns.sql - The SQL UPDATE statement
+ * @returns {unknown[]} returns.params - Array of parameter values
+ * @example
+ * ```typescript
+ * const contact = { name: 'Jane Doe' };
+ * const { sql, params } = generateUpdateStatement(contact, 'contacts', 'did = ?', ['did:example:123']);
+ * // sql: "UPDATE contacts SET name = ? WHERE did = ?"
+ * // params: ['Jane Doe', 'did:example:123']
+ * ```
  */
 export function generateUpdateStatement(
   model: Record<string, unknown>,
@@ -217,10 +302,8 @@ export function generateUpdateStatement(
   const params: unknown[] = [];
 
   Object.entries(model).forEach(([key, value]) => {
-    if (value !== undefined) {
+    setClauses.push(`${key} = ?`);
-      setClauses.push(`${key} = ?`);
+    params.push(value ?? null);
-      params.push(value);
-    }
   });
 
   if (setClauses.length === 0) {
@@ -265,3 +348,115 @@ export function mapColumnsToValues(
     return obj;
   });
 }
+
+/**
+ * Debug function to inspect raw settings data in the database
+ * This helps diagnose issues with data corruption or malformed JSON
+ * @param did Optional DID to inspect specific account settings
+ * @author Matthew Raymer
+ */
+export async function debugSettingsData(did?: string): Promise<void> {
+  try {
+    const platform = PlatformServiceFactory.getInstance();
+
+    // Get all settings records
+    const allSettings = await platform.dbQuery("SELECT * FROM settings");
+
+    logConsoleAndDb(
+      `[DEBUG] Total settings records: ${allSettings?.values?.length || 0}`,
+      false,
+    );
+
+    if (allSettings?.values?.length) {
+      allSettings.values.forEach((row, index) => {
+        const settings = mapColumnsToValues(allSettings.columns, [row])[0];
+        logConsoleAndDb(`[DEBUG] Settings record ${index + 1}:`, false);
+        logConsoleAndDb(`[DEBUG] - ID: ${settings.id}`, false);
+        logConsoleAndDb(`[DEBUG] - accountDid: ${settings.accountDid}`, false);
+        logConsoleAndDb(`[DEBUG] - activeDid: ${settings.activeDid}`, false);
+
+        if (settings.searchBoxes) {
+          logConsoleAndDb(
+            `[DEBUG] - searchBoxes type: ${typeof settings.searchBoxes}`,
+            false,
+          );
+          logConsoleAndDb(
+            `[DEBUG] - searchBoxes value: ${String(settings.searchBoxes)}`,
+            false,
+          );
+
+          // Try to parse it
+          try {
+            const parsed = JSON.parse(String(settings.searchBoxes));
+            logConsoleAndDb(
+              `[DEBUG] - searchBoxes parsed successfully: ${JSON.stringify(parsed)}`,
+              false,
+            );
+          } catch (parseError) {
+            logConsoleAndDb(
+              `[DEBUG] - searchBoxes parse error: ${parseError}`,
+              true,
+            );
+          }
+        }
+
+        logConsoleAndDb(
+          `[DEBUG] - Full record: ${JSON.stringify(settings, null, 2)}`,
+          false,
+        );
+      });
+    }
+
+    // If specific DID provided, also check accounts table
+    if (did) {
+      const account = await platform.dbQuery(
+        "SELECT * FROM accounts WHERE did = ?",
+        [did],
+      );
+      logConsoleAndDb(
+        `[DEBUG] Account for ${did}: ${JSON.stringify(account, null, 2)}`,
+        false,
+      );
+    }
+  } catch (error) {
+    logConsoleAndDb(`[DEBUG] Error inspecting settings data: ${error}`, true);
+  }
+}
+
+/**
+ * Platform-agnostic JSON parsing utility
+ * Handles different SQLite implementations:
+ * - Web SQLite (wa-sqlite/absurd-sql): Auto-parses JSON strings to objects
+ * - Capacitor SQLite: Returns raw strings that need manual parsing
+ *
+ * @param value The value to parse (could be string or already parsed object)
+ * @param defaultValue Default value if parsing fails
+ * @returns Parsed object or default value
+ * @author Matthew Raymer
+ */
+export function parseJsonField<T>(value: unknown, defaultValue: T): T {
+  try {
+    // If already an object (web SQLite auto-parsed), return as-is
+    if (typeof value === "object" && value !== null) {
+      return value as T;
+    }
+
+    // If it's a string (Capacitor SQLite or fallback), parse it
+    if (typeof value === "string") {
+      return JSON.parse(value) as T;
+    }
+
+    // If it's null/undefined, return default
+    if (value === null || value === undefined) {
+      return defaultValue;
+    }
+
+    return defaultValue;
+  } catch (error) {
+    logConsoleAndDb(
+      `[databaseUtil] Failed to parse JSON field: ${error}`,
+      true,
+    );
+    return defaultValue;
+  }
+}

src/db/tables/README.md

@@ -1 +1 @@
-Check the contact & settings export to see whether you want your new table to be included in it.
+# Check the contact & settings export to see whether you want your new table to be included in it

src/db/tables/contacts.ts

@@ -1,15 +1,16 @@
-export interface ContactMethod {
+export type ContactMethod = {
   label: string;
   type: string; // eg. "EMAIL", "SMS", "WHATSAPP", maybe someday "GOOGLE-CONTACT-API"
   value: string;
-}
+};
 
-export interface Contact {
+export type Contact = {
   //
-  // When adding a property, consider whether it should be added when exporting & sharing contacts.
+  // When adding a property, consider whether it should be added when exporting & sharing contacts, eg. DataExportSection
 
   did: string;
   contactMethods?: Array<ContactMethod>;
+  iViewContent?: boolean;
   name?: string;
   nextPubKeyHashB64?: string; // base64-encoded SHA256 hash of next public key
   notes?: string;
@@ -17,7 +18,17 @@ export interface Contact {
   publicKeyBase64?: string;
   seesMe?: boolean; // cached value of the server setting
   registered?: boolean; // cached value of the server setting
-}
+};
+
+/**
+ * This is for those cases (eg. with a DB) where every field is a primitive (and not an object).
+ *
+ * This is so that we can reuse most of the type and don't have to maintain another copy.
+ * Another approach uses typescript conditionals: https://chatgpt.com/share/6855cdc3-ab5c-8007-8525-726612016eb2
+ */
+export type ContactWithJsonStrings = Omit<Contact, "contactMethods"> & {
+  contactMethods?: string;
+};
 
 export const ContactSchema = {
   contacts: "&did, name", // no need to key by other things

src/db/tables/settings.ts

@@ -64,6 +64,11 @@ export type Settings = {
   webPushServer?: string; // Web Push server URL
 };
 
+// type of settings where the searchBoxes are JSON strings instead of objects
+export type SettingsWithJsonStrings = Settings & {
+  searchBoxes: string;
+};
+
 export function checkIsAnyFeedFilterOn(settings: Settings): boolean {
   return !!(settings?.filterFeedByNearby || settings?.filterFeedByVisible);
 }

src/electron/preload.js

@@ -1,9 +1,10 @@
 const { contextBridge, ipcRenderer } = require("electron");
+import { NodeEnv, BuildPlatform } from "@/interfaces/build";
 
 const logger = {
   log: (message, ...args) => {
     // Always log in development, log with context in production
-    if (process.env.NODE_ENV !== "production") {
+    if (process.env.NODE_ENV !== NodeEnv.Prod) {
       /* eslint-disable no-console */
       console.log(`[Preload] ${message}`, ...args);
       /* eslint-enable no-console */
@@ -23,7 +24,7 @@ const logger = {
   },
   info: (message, ...args) => {
     // Always log info in development, log with context in production
-    if (process.env.NODE_ENV !== "production") {
+    if (process.env.NODE_ENV !== NodeEnv.Prod) {
       /* eslint-disable no-console */
       console.info(`[Preload] ${message}`, ...args);
       /* eslint-enable no-console */
@@ -53,7 +54,7 @@ const getPath = (pathType) => {
 logger.info("Preload script starting...");
 
 // Force electron platform in the renderer process
-window.process = { env: { VITE_PLATFORM: "electron" } };
+window.process = { env: { VITE_PLATFORM: BuildPlatform.Electron } };
 
 try {
   contextBridge.exposeInMainWorld("electronAPI", {
@@ -76,12 +77,12 @@ try {
     // Environment info
     env: {
       isElectron: true,
-      isDev: process.env.NODE_ENV === "development",
+      isDev: process.env.NODE_ENV === NodeEnv.Dev,
-      platform: "electron", // Explicitly set platform
+      platform: BuildPlatform.Electron, // Explicitly set platform
     },
     // Path utilities
     getBasePath: () => {
-      return process.env.NODE_ENV === "development" ? "/" : "./";
+      return process.env.NODE_ENV === NodeEnv.Dev ? "/" : "./";
     },
   });
 

src/interfaces/build.ts

@@ -0,0 +1,21 @@
+export const NodeEnv = {
+  Dev: "dev",
+  Test: "test",
+  Prod: "prod",
+} as const;
+export type NodeEnv = typeof NodeEnv[keyof typeof NodeEnv];
+
+export const BuildEnv = {
+  Development: "development",
+  Testing: "testing",
+  Production: "production",
+} as const;
+export type BuildEnv = typeof BuildEnv[keyof typeof BuildEnv];
+
+export const BuildPlatform = {
+  Web: "web",
+  Electron: "electron",
+  Capacitor: "capacitor",
+  PyWebView: "pywebview",
+} as const;
+export type BuildPlatform = typeof BuildPlatform[keyof typeof BuildPlatform];

src/interfaces/claims-result.ts

@@ -1,6 +1,4 @@
-import { AxiosResponse } from "axios";
 import { GiverReceiverInputInfo } from "../libs/util";
-import { ErrorResult, ResultWithType } from "./common";
 
 export interface GiverOutputInfo {
   action: string;
@@ -47,12 +45,3 @@ export interface ProviderInfo {
    */
   linkConfirmed: boolean;
 }
-
-// Type for createAndSubmitClaim result
-export type CreateAndSubmitClaimResult = SuccessResult | ErrorResult;
-
-// Update SuccessResult to use ClaimResult
-export interface SuccessResult extends ResultWithType {
-  type: "success";
-  response: AxiosResponse<ClaimResult>;
-}

src/interfaces/claims.ts

@@ -1,14 +1,24 @@
-import { GenericVerifiableCredential } from "./common";
+/**
+ * Types of Claims
+ *
+ * Note that these are for the claims that get signed.
+ * Records that are the latest edited entities are in the records.ts file.
+ *
+ */
 
-export interface AgreeVerifiableCredential {
+import { ClaimObject } from "./common";
-  "@context": string;
+
+export interface AgreeActionClaim extends ClaimObject {
+  "@context": "https://schema.org";
   "@type": string;
   object: Record<string, unknown>;
 }
 
 // Note that previous VCs may have additional fields.
 // https://endorser.ch/doc/html/transactions.html#id4
-export interface GiveVerifiableCredential extends GenericVerifiableCredential {
+export interface GiveActionClaim extends ClaimObject {
+  // context is optional because it might be embedded in another claim, eg. an AgreeAction
+  "@context"?: "https://schema.org";
   "@type": "GiveAction";
   agent?: { identifier: string };
   description?: string;
@@ -16,43 +26,21 @@ export interface GiveVerifiableCredential extends GenericVerifiableCredential {
   identifier?: string;
   image?: string;
   object?: { amountOfThisGood: number; unitCode: string };
-  provider?: GenericVerifiableCredential;
+  provider?: ClaimObject;
   recipient?: { identifier: string };
-  type: string[];
+}
-  issuer: string;
+
-  issuanceDate: string;
+export interface JoinActionClaim extends ClaimObject {
-  credentialSubject: {
+  agent?: { identifier: string };
-    id: string;
+  event?: { organizer?: { name: string }; name?: string; startTime?: string };
-    type: "GiveAction";
-    offeredBy?: {
-      type: "Person";
-      identifier: string;
-    };
-    offeredTo?: {
-      type: "Person";
-      identifier: string;
-    };
-    offeredToProject?: {
-      type: "Project";
-      identifier: string;
-    };
-    offeredToProjectVisibleToDids?: string[];
-    offeredToVisibleToDids?: string[];
-    offeredByVisibleToDids?: string[];
-    amount: {
-      type: "QuantitativeValue";
-      value: number;
-      unitCode: string;
-    };
-    startTime?: string;
-    endTime?: string;
-  };
 }
 
 // Note that previous VCs may have additional fields.
 // https://endorser.ch/doc/html/transactions.html#id8
-export interface OfferVerifiableCredential extends GenericVerifiableCredential {
+export interface OfferClaim extends ClaimObject {
+  "@context": "https://schema.org";
   "@type": "Offer";
+  agent?: { identifier: string };
   description?: string;
   fulfills?: { "@type": string; identifier?: string; lastClaimId?: string }[];
   identifier?: string;
@@ -67,43 +55,18 @@ export interface OfferVerifiableCredential extends GenericVerifiableCredential {
       name?: string;
     };
   };
-  provider?: GenericVerifiableCredential;
+  offeredBy?: {
+    type?: "Person";
+    identifier: string;
+  };
+  provider?: ClaimObject;
   recipient?: { identifier: string };
   validThrough?: string;
-  type: string[];
-  issuer: string;
-  issuanceDate: string;
-  credentialSubject: {
-    id: string;
-    type: "Offer";
-    offeredBy?: {
-      type: "Person";
-      identifier: string;
-    };
-    offeredTo?: {
-      type: "Person";
-      identifier: string;
-    };
-    offeredToProject?: {
-      type: "Project";
-      identifier: string;
-    };
-    offeredToProjectVisibleToDids?: string[];
-    offeredToVisibleToDids?: string[];
-    offeredByVisibleToDids?: string[];
-    amount: {
-      type: "QuantitativeValue";
-      value: number;
-      unitCode: string;
-    };
-    startTime?: string;
-    endTime?: string;
-  };
 }
 
 // Note that previous VCs may have additional fields.
 // https://endorser.ch/doc/html/transactions.html#id7
-export interface PlanVerifiableCredential extends GenericVerifiableCredential {
+export interface PlanActionClaim extends ClaimObject {
   "@context": "https://schema.org";
   "@type": "PlanAction";
   name: string;
@@ -117,11 +80,18 @@ export interface PlanVerifiableCredential extends GenericVerifiableCredential {
 }
 
 // AKA Registration & RegisterAction
-export interface RegisterVerifiableCredential {
+export interface RegisterActionClaim extends ClaimObject {
-  "@context": string;
+  "@context": "https://schema.org";
   "@type": "RegisterAction";
   agent: { identifier: string };
   identifier?: string;
-  object: string;
+  object?: string;
   participant?: { identifier: string };
 }
+
+export interface TenureClaim extends ClaimObject {
+  "@context": "https://endorser.ch";
+  "@type": "Tenure";
+  party?: { identifier: string };
+  spatialUnit?: { geo?: { polygon?: string } };
+}

src/interfaces/common.ts

@@ -1,6 +1,6 @@
 // similar to VerifiableCredentialSubject... maybe rename this
 export interface GenericVerifiableCredential {
-  "@context": string | string[];
+  "@context"?: string;
   "@type": string;
   [key: string]: unknown;
 }
@@ -15,10 +15,6 @@ export interface GenericCredWrapper<T extends GenericVerifiableCredential> {
   publicUrls?: Record<string, string>;
 }
 
-export interface ResultWithType {
-  type: string;
-}
-
 export interface ErrorResponse {
   error?: {
     message?: string;
@@ -30,30 +26,28 @@ export interface InternalError {
   userMessage?: string;
 }
 
-export interface ErrorResult extends ResultWithType {
-  type: "error";
-  error: InternalError;
-}
-
 export interface KeyMeta {
   did: string;
-  name?: string;
   publicKeyHex: string;
-  mnemonic: string;
+  derivationPath?: string;
-  derivationPath: string;
-  registered?: boolean;
-  profileImageUrl?: string;
-  identity?: string; // Stringified IIdentifier object from Veramo
   passkeyCredIdHex?: string; // The Webauthn credential ID in hex, if this is from a passkey
-  [key: string]: unknown;
+}
+
+export interface KeyMetaMaybeWithPrivate extends KeyMeta {
+  mnemonic?: string; // 12 or 24 words encoding the seed
+  identity?: string; // Stringified IIdentifier object from Veramo
+}
+
+export interface KeyMetaWithPrivate extends KeyMeta {
+  mnemonic: string; // 12 or 24 words encoding the seed
+  identity: string; // Stringified IIdentifier object from Veramo
 }
 
 export interface QuantitativeValue extends GenericVerifiableCredential {
   "@type": "QuantitativeValue";
-  "@context": string | string[];
+  "@context"?: string;
   amountOfThisGood: number;
   unitCode: string;
-  [key: string]: unknown;
 }
 
 export interface AxiosErrorResponse {
@@ -87,94 +81,21 @@ export interface CreateAndSubmitClaimResult {
   handleId?: string;
 }
 
-export interface PlanSummaryRecord {
-  handleId: string;
-  issuer: string;
-  claim: GenericVerifiableCredential;
-  [key: string]: unknown;
-}
-
 export interface Agent {
   identifier?: string;
   did?: string;
-  [key: string]: unknown;
 }
 
 export interface ClaimObject {
   "@type": string;
-  "@context"?: string | string[];
+  "@context"?: string;
-  fulfills?: Array<{
-    "@type": string;
-    identifier?: string;
-    [key: string]: unknown;
-  }>;
-  object?: GenericVerifiableCredential;
-  agent?: Agent;
-  participant?: {
-    identifier?: string;
-    [key: string]: unknown;
-  };
-  identifier?: string;
   [key: string]: unknown;
 }
 
 export interface VerifiableCredentialClaim {
-  "@context": string | string[];
+  "@context"?: string;
   "@type": string;
   type: string[];
   credentialSubject: ClaimObject;
   [key: string]: unknown;
 }
-
-export interface GiveVerifiableCredential extends GenericVerifiableCredential {
-  "@type": "GiveAction";
-  "@context": string | string[];
-  object?: GenericVerifiableCredential;
-  agent?: Agent;
-  participant?: {
-    identifier?: string;
-    [key: string]: unknown;
-  };
-  fulfills?: Array<{
-    "@type": string;
-    identifier?: string;
-    [key: string]: unknown;
-  }>;
-  [key: string]: unknown;
-}
-
-export interface OfferVerifiableCredential extends GenericVerifiableCredential {
-  "@type": "OfferAction";
-  "@context": string | string[];
-  object?: GenericVerifiableCredential;
-  agent?: Agent;
-  participant?: {
-    identifier?: string;
-    [key: string]: unknown;
-  };
-  itemOffered?: {
-    description?: string;
-    isPartOf?: {
-      "@type": string;
-      identifier: string;
-      [key: string]: unknown;
-    };
-    [key: string]: unknown;
-  };
-  [key: string]: unknown;
-}
-
-export interface RegisterVerifiableCredential
-  extends GenericVerifiableCredential {
-  "@type": "RegisterAction";
-  "@context": string | string[];
-  agent: {
-    identifier: string;
-  };
-  object: string;
-  participant?: {
-    identifier: string;
-  };
-  identifier?: string;
-  [key: string]: unknown;
-}