Merge pull request 'misc tweaks for new vite build' (#4) from trentlarson/crowd-funder-from-jason:feat/vitejs-trent3 into feat/vitejs

Reviewed-on: jsnbuchanan/crowd-funder-for-time-pwa#4

.env.development

@@ -1,3 +1,7 @@
 
-# I tried and failed to set things here with vue-cli-service but
-# things may be more reliable with vite so let's try again.
+# I tried setting values here and using `vue-cli-service build --mode development`
+# but it didn't create some things in "dist":
+# - the "css" directory with the CSS extracted from Vue files
+# - the sw_scripts-combined* files
+#
+# ¯\_(ツ)_/¯

.env.production

@@ -1,4 +1,4 @@
-# Only the variables that start with VITE_ are seen in the application import.meta.env in Vue.
+# Only the variables that start with VITE_ are seen in the application process.env in Vue.
 VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https://endorser.ch/entity/01GXYPFF7FA03NXKPYY142PY4H
 VITE_DEFAULT_ENDORSER_API_SERVER=https://api.endorser.ch
 VITE_DEFAULT_IMAGE_API_SERVER=https://image-api.timesafari.app

.github/workflows/playwright.yml

@@ -1,27 +0,0 @@
-name: Playwright Tests
-on:
-  push:
-    branches: [ main, master ]
-  pull_request:
-    branches: [ main, master ]
-jobs:
-  test:
-    timeout-minutes: 60
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version: lts/*
-    - name: Install dependencies
-      run: npm ci
-    - name: Install Playwright Browsers
-      run: npx playwright install --with-deps
-    - name: Run Playwright tests
-      run: npx playwright test
-    - uses: actions/upload-artifact@v4
-      if: always()
-      with:
-        name: playwright-report
-        path: playwright-report/
-        retention-days: 30

.gitignore

@@ -27,7 +27,3 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
-/test-results/
-/playwright-report/
-/blob-report/
-/playwright/.cache/

CHANGELOG.md

@@ -5,114 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-
-## ?
-### Fixed
-- List of offers wasn't showing.
-
-
-## [0.3.17] - 2024.07.11 - cefa384ff1a2d922848c370640c096c529920fab
-### Added
-- Photos on more screens
-### Fixed
-- Share of a photo, including sharing a photo from webkit/Safari which never worked
-### Changed in DB or environment
-- Nothing (though there's a new temp field in IndexedDB)
-
-
-## [0.3.15] - 2024.08.04 - c8f0f2c2b16b9f0b4b47d40f7bf29058c7baa68e
-### Added
-- Edit gives
-- Page to edit claim JSON before submitting
-- Update of imported contacts
-- Improve messaging on give dialog
-- Section for gives provided by plan
-- Deletion of an identity
-- UI for choosing a passkey creation (not enabled on prod)
-- Cache signatures for reports for passkey-signed requests
-- Refactor: consolidate alternative signing, eg. for passkeys & did:peer
-- Playwright tests
-### Changed
-- Linked projects display below description (instead of at bottom)
-### Fixed
-- Visibility toggle appearance
-### Changed in DB or environment
-- Nothing
-
-
-## [0.3.14] - 2024.06.22 - 1611d22892f683f43856d2503eee7f391b6bbce8
-### Added
-- Clearer give-confirmation screen
-- BX currency https://thebx.medium.com/
-- Deselection of project on gifted details page
-### Fixed
-- Don't show registration pop-up for a new contact that is registered
-### Changed in DB or environment
-- Nothing
-
-
-## [0.3.13] - 2024.05.24 - 08b67984e443c58d9178ad3776013b0bce7afddc
-### Added
-- Photos on projects
-### Changed in DB or environment
-- Nothing
-
-
-## [0.3.12] - 2024.05.19 - 141fb39ad19c44d82fe1a33bf85115beacf50870
-### Fixed
-- Photo share (share_target) failed because requests were sent to server
-### Changed in DB or environment
-- Nothing
-
-
-## [0.3.11] - 2024.05.19 - 567bcad88dfb7e9ac8fea72530d1163985e4a7cc
-### Added
-- Choose a file for gifts, and a URL for gifts & profiles
-### Fixed
-- Multiple button pushes were required to switch camera
-### Changed in DB or environment
-- Nothing
-
-
-## [0.3.10] - 2024.05.11 - 03ac31d98110f7828cf9acb366db8d01b185f64c
-### Added
-- Share an image
-- Choose a file on the device for a profile image
-### Changed in DB or environment
-- Nothing
-
-
-## [0.3.9] - 2024.04.28 - 874e717e698b93a1ace9f588e675b8a3dccd7617
-### Added
-- Offers on contacts page
-- Checks on front page until they show as registered
-### Changed
-- Scanned contacts now add immediately and prompt for registration.
-- Better UI for gives on contact page
-- Better UI for all confirmation messages
-### Fixed
-- Repeated elements at top of main feed
-### Changed in DB or environment
-- Nothing
-
-
-## [0.3.8] - 2024.04.20 - 15c026c80ce03a26cae3ff80b0888934c101c7e2
-### Added
-- Profile image for user
-### Fixed
-- Slow loading of home page feed
-### Changed in DB or environment
-- Nothing
-
-
-## [0.3.7] - 2024.04.10 - cf18f1543a700d62a5f9e764905a4aafe1fb229b
-### Added
-- Filter on home page feed
-- Ability to set time of daily notification
-- Jump to app on click of notification
-### Changed
-- Built with vite
-- Descriptions on home page to include projects
+## [Unreleased]
 ### Changed in DB or environment
 - Nothing
 

CONTRIBUTING.md

@@ -2,10 +2,5 @@
 
 Welcome! We are happy to have your help with this project.
 
-We expect contributions to include automated tests and pass linting. Run the `test-all` task.
-Note that some previous features don't have tests and adding more will make you friends quick.
-
-Note that all contributions will be under our [license, modeled after SQLite](https://github.com/trentlarson/endorser-ch/blob/master/LICENSE).
-
-If you want to see a code of conduct, we're probably not the people you want to hang with.
-Basically, we'll work together as long as we both enjoy it, and we'll stop when that stops.
+Note that all contributions will be under our
+[license, modeled after SQLite](https://github.com/trentlarson/endorser-ch/blob/master/LICENSE).

README.md

@@ -10,46 +10,44 @@ See [project.task.yaml](project.task.yaml) for current priorities.
 
 ## Setup
 
-We like pkgx: `sh <(curl https://pkgx.sh) +npm sh`
+We have pkgx.dev set up in package.json, so you can use `dev` to set up the dev environment.
 
 ```
 npm install
 ```
 
-### Compile and hot-reloads for development
+### Compiles and hot-reloads for development
 ```
 npm run dev
 ```
 
-### Build the test & production app
+### Builds the production app
 ```
 npm run serve
 ```
 
-### Lint and fix files
+### Lints and fixes files
 ```
 npm run lint
 ```
 
-### Compile and minify for test & production
+### Compiles and minifies for production
 
 * If there are DB changes: before updating the test server, open browser(s) with current version to test DB migrations.
 
 * `npx prettier --write ./sw_scripts/`
 
-* Update the ClickUp tasks & CHANGELOG.md & the version in package.json, run `npm install`.
-
-* Commit everything (since the commit hash is used the app).
+* Update the project.task.yaml & CHANGELOG.md & the version in package.json, run `npm install`.
 
 * Record what version is currently on production.
 
-* Run the correct build:
+* Run the correct build
 
-  * Staging
+  * Test
 ```
-# (Let's replace this with a .env.development or .env.staging file.)
+# (See .env.development for more details.)
 # The test BVC_MEETUPS_PROJECT_CLAIM_ID does not resolve as a URL because it's only in the test DB and the prod redirect won't redirect there.
-TIME_SAFARI_APP_TITLE="TimeSafari_Test" VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https://endorser.ch/entity/01HNTZYJJXTGT0EZS3VEJGX7AK VITE_DEFAULT_ENDORSER_API_SERVER=https://test-api.endorser.ch VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app VITE_PASSKEYS_ENABLED=yep npm run build
+VITE_TIME_SAFARI_APP_TITLE="TimeSafari_Test" VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https://endorser.ch/entity/01HNTZYJJXTGT0EZS3VEJGX7AK VITE_DEFAULT_ENDORSER_API_SERVER=https://test-api.endorser.ch VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app npm run build
 ```
 
   * Production
@@ -58,7 +56,7 @@ TIME_SAFARI_APP_TITLE="TimeSafari_Test" VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https:
 npm run build
 ```
 
-* Get on the server and back up the time-safari/dist folder.
+* Get on the server and back up 3 DBs and the time-safari folder.
 
 * `rsync -azvu -e "ssh -i ~/.ssh/..." dist ubuntutest@test.timesafari.app:time-safari`
 
@@ -71,41 +69,6 @@ npm run build
 
 ## Tests
 
-### Automated
-
-Use the locally running Endorser server:
-
-* Clone and set up https://github.com/trentlarson/endorser-ch and run the following in that directory:
-```
-test/test.sh
-NODE_ENV=test-local npm run dev
-```
-
-* Now run the local tests:
-```
-npm run test-all
-```
-
-Note that a test will sometimes fail and rerunning may succeed (and repeat if a different test fails).
-
-
-
-
-It's possible to use the global test Endorser (ledger) server (but currently the tests don't all succeed):
-`npx playwright test`
-
-
-
-
-It's possible to run with a minimal set of data: the following starts with the bare minimum of test data (but currently the tests don't all succeed):
-```
-rm ../endorser-ch-test-local.sqlite3
-NODE_ENV=test-local npm run flyway migrate
-NODE_ENV=test-local npm run test test/controller0
-NODE_ENV=test-local npm run dev
-```
-
-
 ### Register new user on test server
 
 On the test server, User #0 has rights to register others, so you can start
@@ -132,11 +95,11 @@ To add an icon, add to main.ts and reference with `fa` element and `icon` attrib
 
 ### Manual walk-through test
 
-- Backup seed & data & get a CSV dump from Endorser Mobile.
-- If there were any DB changes, check that you're on the old version and reload the page and ensure you can still act and haven't lost data (ie. contacts, identities).
+- If there were any DB changes, check that you're on the old version and reload the page and ensure you can still act.
 - Use a mobile user as well as a desktop user.
+- Backup seed & data & get a CSV dump from Endorser Mobile.
 - Check that the version is updated.
-  - Clear the browser data & add identity & import Time Safari contacts and then CSV contacts.
+- Clear the browser data & add identity & import Time Safari contacts and then CSV contacts.
 - Make sure that it's using the test API (under Identity in 'Advanced').
 - Clear the browser data again. (See "Reset" below.)
   - Go to the account page before visiting the home page to see that there is no ID.
@@ -146,19 +109,15 @@ To add an icon, add to main.ts and reference with `fa` element and `icon` attrib
     - Copy the contact URL.
   - On each page, verify the messaging, and that they cannot take action.
   - On the discovery page, check that they can see projects, and set a search area to see projects nearby.
-  - On the contacts page, check that they can add a contact even without their own ID.
-- Install the PWA.
-- As User 0 in another browser on the test API, add a give & a project.
-  - Note that some combinations of desktop with mobile emulation stretch the image.
-  - Import User 0 with seed: `rigid shrug mobile smart veteran half all pond toilet brave review universe ship congress found yard skate elite apology jar uniform subway slender luggage`
-  - Add new user as a contact (which allows them to see User 0).
-  - With the new user on the home page, see the feed that shows User 0 in network but without the name.
-- As the new user, import contacts & identifiers.
-- As the new user on the contacts page, add User 0 as a contact.
-  - On the home page, see the feed that shows User 0 with a name.
+  - On the contacts page, check that they can add User #0 even without their own ID.
+- As User #0 in another browser on the test API, add a give & a project.
+  - `rigid shrug mobile smart veteran half all pond toilet brave review universe ship congress found yard skate elite apology jar uniform subway slender luggage`
+  - With the new user on the home page, see the feed that shows User #0 in network but without the name.
+- As the new user on the contacts page, add User #0 as a contact.
+  - On the home page, see the feed that shows User #0 with a name.
 - Switch back to the generated identifier.
   - On the account page, check that they see messages on limits.
-- As User 0, register the ID.
+- As User #0, register the ID.
 - As the new user on the home page, check that they can now record a gift, and record an offer & delivery.
 - On the contacts page, check that they cannot register someone else yet.
 - Walk through the functions on each page.
@@ -166,7 +125,6 @@ To add an icon, add to main.ts and reference with `fa` element and `icon` attrib
 - Export & import, both seed and contacts & settings.
 - Choose location on the search map.
 - Offer, deliver a give, and confirm. Create a third user and test connections.
-- On mobile, share an image with the app.
 - Switch to "no identifier" to see that things look OK without any ID.
 
 ### Clear/Reset data & restart

doc/README.md

@@ -1,76 +0,0 @@
-# TimeSafari Docs
-
-## Generating PDF from Markdown on OSx
-
-This uses Pandoc and BasicTex (LaTeX) Installed through Homebrew.
-
-### Set Up
-
-```bash 
-brew install pandoc
-
-brew install basictex
-
-# Setting up LaTex packages
-
-# First update tlmgr
-sudo tlmgr update --self
-
-# Then install LaTex packages
-sudo tlmgr install bbding
-sudo tlmgr install enumitem
-sudo tlmgr install environ
-sudo tlmgr install fancyhdr
-sudo tlmgr install framed
-sudo tlmgr install import
-sudo tlmgr install lastpage  # Enables Page X of Y
-sudo tlmgr install mdframed
-sudo tlmgr install multirow
-sudo tlmgr install needspace
-sudo tlmgr install ntheorem
-sudo tlmgr install tabu
-sudo tlmgr install tcolorbox
-sudo tlmgr install textpos
-sudo tlmgr install titlesec
-sudo tlmgr install titling  # Required for the fancy headers used
-sudo tlmgr install threeparttable
-sudo tlmgr install trimspaces
-sudo tlmgr install tocloft  # Required for \tableofcontents generation
-sudo tlmgr install varwidth
-sudo tlmgr install wrapfig
-
-# Install fonts
-sudo tlmgr install cmbright
-sudo tlmgr install collection-fontsrecommended # And set up fonts
-sudo tlmgr install fira
-sudo tlmgr install fontaxes
-sudo tlmgr install libertine # The main font the doc uses
-sudo tlmgr install opensans
-sudo tlmgr install sourceserifpro
-
-```
-
-#### References
-
-The following guide was adapted to this project except that we install with Brew and have a few more packages.
-
-Guide: https://daniel.feldroy.com/posts/setting-up-latex-on-mac-os-x
-
-### Usage
-
-Use the `pandoc` command to generate a PDF.
-
-```bash
-pandoc usage-guide.md -o usage-guide.pdf 
-```
-
-And you can open the PDF with the `open` command.
-
-```bash
-open usage-guide.pdf
-```
-
-Or use this one-liner
-```bash
-pandoc usage-guide.md -o usage-guide.pdf && open usage-guide.pdf
-```

doc/usage-guide.md

@@ -1,316 +0,0 @@
----
-geometry: margin=1in
-header-includes:
-    - \usepackage{graphicx}
-    - \usepackage{titling}
-    - \usepackage{fancyhdr}
-    - \usepackage{lastpage}
-    - \pagestyle{fancy}
-    - \fancyhead[L]{Time Safari Usage Guide}
-    - \fancyhead[C]{Page \thepage\ of \pageref{LastPage}}
-    - \fancyhead[R]{}
-    - \fancyfoot[L]{}
-    - \fancyfoot[C]{}
-    - \fancyfoot[R]{\includegraphics[width=1cm]{images/timesafari-logo-binoculars.png}}
-    - \usepackage{tocloft}
-    - \usepackage{libertine}
-    - \renewcommand{\familydefault}{\sfdefault}
-    - \fancypagestyle{tocstyle}{
-      \fancyhead[L]{Time Safari Usage Guide}
-      \fancyhead[C]{Page \thepage\ of \pageref{LastPage}}
-      \fancyhead[R]{}
-      \fancyfoot[L]{}
-      \fancyfoot[C]{}
-      \fancyfoot[R]{\includegraphics[width=1cm]{images/timesafari-logo-binoculars.png}}}
----
-
-\begin{titlepage}
-\centering
-\vspace*{\fill}
-{\huge\textbf{TimeSafari Usage guide}}
-
-\vspace{1cm}
-{\Large Signing up users, adding contacts, and adding gifts.}
-
-\vspace{1cm}
-\includegraphics[width=0.5\textwidth]{images/timesafari-logo.png}
-\vspace*{\fill}
-
-\vspace{1cm}
-{\Large Trent Larson, Kent Bull}
-
-\vspace{0.5cm}
-{\large 2024-06-25}
-
-\end{titlepage}
-
-\clearpage
-
-\begin{center}
-\includegraphics[width=2cm]{images/timesafari-logo-binoculars.png}
-\end{center}
-\tableofcontents
-
-\clearpage
-
-
-# Purpose of Document
-
-Both end-users and development team members need to know how to use TimeSafari. 
-This document serves to show how to use every feature of the TimeSafari platform.
-
-Sections of this document are geared specifically for software developers and quality assurance
-team members.
-
-Companion videos will also describe end-to-end workflows for the end-user.
-
-# TimeSafari 
-
-## Overview
-
-\pagebreak
-
-# 1 - End Users
-
-This section covers application usage for people who will use TimeSafari as intended. It is a
-simplified guide illustrating how to gain value from using TimeSafari.
-
-\pagebreak
-
-# 2 - Software Developers
-
-This section is tailored for software developers seeking to use the application during development,
-quality assurance, and testing.
-
-# Bootstrapping a local development environment
-
-The first concern a software developer has when working on TimeSafari is to set up a local
-development environment. This section will guide you through the process.
-
-## Prerequisites
-
-1. Have the following installed on your local machine:
-  - Node.js and NPM
-  - A web browser. For this guide, we will use Google Chrome.
-  - Git
-  - A code editor
-
-2. Create an API key on Infura. This is necessary for the Endorser API to connect to the Ethereum
-   blockchain. 
-  - You can create an account on Infura [here](https://infura.io/).\
-    Click "CREATE NEW API KEY" and label the key. Then click "API Keys" in the top menu bar to
-    be taken back to the list of keys.
-    
-    Click "VIEW STATS" on the key you want to use.   
-    
-    ![](images/01_infura-api-keys.png){ width=550px }
-  
-  - Go to the key detail page. Then click "MANAGE API KEY".
-  
-    ![](images/02-infura-key-detail.png){ width=550px }
-  
-  - Click the copy and paste button next to the string of alphanumeric characters.\
-    This is your API, also known as your project ID.
-  
-    ![](images/03-infura-api-key-id.png){width=550px }
-  
-  - Save this for later during the Endorser API setup. This will go in your `INFURA_PROJECT_ID` 
-    environment variable.
-    
-
-## Setup steps
-
-### 1. Clone the following repositories from their respective Git hosts:
-  - [TimeSafari Frontend](https://gitea.anomalistdesign.com/trent_larson/crowd-funder-for-time-pwa)\
-    This is a Progressive Web App (PWA) built with VueJS and TypeScript.
-    Note that the clone command here is different from the one you would use for GitHub.
-    
-```bash
-git clone git clone \
-  ssh://git@gitea.anomalistdesign.com:222/trent_larson/crowd-funder-for-time-pwa.git
-```
-  
-  - [TimeSafari Backend - Endorser API](https://github.com/trentlarson/endorser-ch)\
-    This is a NodeJS service providing the backend for TimeSafari.
-    
-    ```bash
-    git clone git@github.com:trentlarson/endorser-ch.git
-    ```
-
-\pagebreak
-
-### 2. Database creation
-
-#### Alternative 1 - use test data
-
-To generate a development database and perform user setup you can run a local test with instructions
-below to generate sample data. Then copy the test database, rename it to `-dev` as below:\
-`cp ../endorser-ch-test-local.sqlite3 ../endorser-ch-dev.sqlite3` \
-and rerun `npm run dev` to give yourself user #0 and others from the ETHR_CRED_DATA in [the endorser.ch test util file](https://github.com/trentlarson/endorser-ch/blob/master/test/util.js#L90)
-
-#### Alternative 2 - boostrap single seed user 
-
-In this method you will end up with two accounts in the database, one for the first boostrap user,
-and the second as the primary user you will use during testing. The first user will invite the
-second user to the app.
-
-1. Install dependencies and environment variables.\
-   In endorser-ch install dependencies and set up environment variables to allow starting it up in
-   development mode.
-   ```bash
-   cd endorser-ch
-   npm clean install  # or npm ci
-   cp .env.local .env
-   ```
-   Edit the .env file's INFURA_PROJECT_ID with the value you saved earlier in the
-   prerequisites.\
-   Then create the SQLite database by running `npm run flyway migrate` with environment variables
-   set correctly to select the default SQLite development user as follows.
-   ```bash
-   export NODE_ENV=dev 
-   export DBUSER=sa 
-   export DBPASS=sasa 
-   npm run flyway migrate
-   ``` 
-   The first run of flyway migrate may take some time to complete because the entire Flyway 
-   distribution must be downloaded prior to executing migrations.
-    
-   Successful output looks similar to the following:
-    
-```
-Database: jdbc:sqlite:../endorser-ch-dev.sqlite3 (SQLite 3.41)
-Schema history table "main"."flyway_schema_history" does not exist yet
-Successfully validated 10 migrations (execution time 00:00.034s)
-Creating Schema History table "main"."flyway_schema_history" ...
-Current version of schema "main": << Empty Schema >>
-Migrating schema "main" to version "1 - initial-anew"
-Migrating schema "main" to version "2 - registration"
-Migrating schema "main" to version "3 - plan project"
-Migrating schema "main" to version "4 - offer gave"
-Migrating schema "main" to version "5 - more confirmations"
-Migrating schema "main" to version "6 - providers urls"
-Migrating schema "main" to version "7 - hash nonce"
-Migrating schema "main" to version "8 - project location"
-Migrating schema "main" to version "9 - plan links"
-Migrating schema "main" to version "10 - gift or trade"
-Successfully applied 10 migrations to schema "main", now at version v10 (execution time 00:00.043s)
-A Flyway report has been generated here: /Users/kbull/code/timesafari/endorser-ch/report.html
-```
-
-\pagebreak
-
-2. Generate the first user in TimeSafari PWA and bootstrap that user in Endorser's database.\
-   As TimeSafari is an invite-only platform the first user must be manually bootstrapped since
-   no other users exist to be able to invite the first user. This first user must be added manually
-   to the SQLite database used by Endorser. In this setup you generate the first user from the PWA. 
-   
-   This user is automatically generated on first usage of the TimeSafari PWA. Bootstrapping that 
-   user is required so that this first user can register other users.
-   - Change directories into `crowd-funder-for-time-pwa`
-     
-     ```bash
-     cd ..
-     cd crowd-funder-for-time-pwa 
-     ```
-   
-   - Ensure the `.env.development` file exists and has the following values:
-   
-     ```env
-     VITE_DEFAULT_ENDORSER_API_SERVER=http://127.0.0.1:3000
-     ```
-   
-   - Install dependencies and run in dev mode. For now don't worry about configuring the app. All we
-     need is to generate the first root user and this happens automatically on app startup.
-  
-     ```bash
-     npm clean install  # or npm ci
-     npm run dev
-     ```
-  
-   - Open the app in a browser and go to the developer tools. It is recommended to use a completely
-     separate browser profile so you do not clear out your existing user account. We will be
-     completely resetting the PWA app state prior to generating the first user.
-   
-     In the Developer Tools go to the Application tab.
-     
-     ![](images/04-pwa-chrome-devtools.png){width=350px} 
-   
-     Click the "Clear site data" button and then refresh the page.
-   
-   - Click the account button in the bottom right corner of the page.
-   
-     ![](images/05-pwa-account-button.png){width=150px}
-   
-   - This will take you to the account page titled "Your Identity" on which you can see your DID,
-     a `did:ethr` DID in this case.
-   
-     ![](images/06-pwa-account-page.png){width=350px}
-   
-   - Copy the DID by selecting it and copying it to the clipboard or by clicking the copy and paste
-     button as shown in the image.
-   
-     ![](images/07-pwa-did-copied.png){width=200px}
-    
-     In our case this DID is:\
-     `did:ethr:0xe4B783c74c8B0e229524e44d0cD898D272E02CD6`
-   
-  - Add that DID to the following echoed SQL statement where it says `YOUR_DID`
-  
-    ```bash
-    echo "INSERT INTO registration (did, maxClaims, maxRegs, epoch) 
-    VALUES ('YOUR_DID', 100, 10000, 1719348718092);"
-    | sqlite3 ./endorser-ch-dev.sqlite3
-    ```
-    
-    and run this command in the parent directory just above the `endorser-ch` directory.
-    
-    It needs to be the parent directory of your `endorser-ch` repository because when 
-    `endorser-ch` creates the SQLite database it depends on it creates it in the parent directory
-    of `endorser-ch`.
-    
-  - You can verify with an SQL browser tool that your record has been added to the `registration`
-    table.
-  
-    ![](images/08-endorser-sqlite-row-added.png){width=350px}
-
-3. Then start the Endorser service in development mode with the following commands.
-  
-    ```bash
-    cd ./endorser-ch
-    export NODE_ENV=dev
-    npm run dev
-    ```
-  
-    This starts the Endorser service on port 3000.
-4. Create the second user by opening up a separate browser profile or incognito session, opening the
-   TimeSafari PWA at `http://localhost:8080`. You will see the yellow banner stating "Someone must
-   register you before you can give or offer."
-   
-   ![](images/09-pwa-second-profile-first-open.png){width=350px}
-   
-   - If you want to ensure you have a fresh user account then open the developer tools, clear the
-     Application data as before, and then refresh the page. This will generate a new user in the 
-     browser's IndexedDB database.
-5. Go to the second users' account page to copy the DID.
-    
-    ![](images/10-pwa-second-user-did.png){width=350px}
-
-6. Copy the DID and put it in the text bar on the "Your Contacts" page for the first account
-
-    ![](images/11-pwa-first-user-add-contact.png){width=350px}
-
-7. Click the "+" plus icon to add the user.
-
-    ![](images/12-pwa-first-user-contact-added.png){width=350px}
-
-8. Then click the register button to register the second user.
-
-    ![](images/13-pwa-first-user-register-second-user-btn.png){width=350px}
-
-9. Click "YES" on the dialog that shows up.
-
-    ![](images/14-pwa-first-user-register-yes.png){width=350px}
-
-    After this a notification will pop up indicating whether registration was successful or not.
-
-10. You have finished the initial set up of users.

package.json

@@ -1,15 +1,15 @@
 {
   "name": "TimeSafari",
-  "version": "0.3.18-beta",
+  "version": "0.3.7-beta",
+  "private": true,
   "scripts": {
     "dev": "vite",
     "serve": "vite preview",
     "build": "VITE_GIT_HASH=`git log -1 --pretty=format:%h` vite build",
     "lint": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src",
     "lint-fix": "eslint --ext .js,.ts,.vue --ignore-path .gitignore --fix src",
-    "prebuild": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src && node sw_combine.js",
-    "test-local": "npx playwright test -c playwright.config-local.ts --trace on",
-    "test-all": "npm run build && npx playwright test -c playwright.config-local.ts --trace on"
+    "postbuild": "cp ./sw_scripts-combined.js dist/",
+    "prebuild": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src && node sw_combine.js"
   },
   "dependencies": {
     "@dicebear/collection": "^5.4.1",
@@ -18,31 +18,27 @@
     "@fortawesome/fontawesome-svg-core": "^6.5.1",
     "@fortawesome/free-solid-svg-icons": "^6.5.1",
     "@fortawesome/vue-fontawesome": "^3.0.6",
-    "@peculiar/asn1-ecc": "^2.3.8",
-    "@peculiar/asn1-schema": "^2.3.8",
     "@pvermeer/dexie-encrypted-addon": "^3.0.0",
-    "@simplewebauthn/browser": "^10.0.0",
-    "@simplewebauthn/server": "^10.0.0",
     "@tweenjs/tween.js": "^21.1.1",
+    "@types/js-yaml": "^4.0.9",
+    "@types/luxon": "^3.4.2",
     "@veramo/core": "^5.6.0",
     "@veramo/credential-w3c": "^5.6.0",
     "@veramo/data-store": "^5.6.0",
     "@veramo/did-manager": "^5.6.0",
     "@veramo/did-provider-ethr": "^5.6.0",
-    "@veramo/did-provider-peer": "^6.0.0",
     "@veramo/did-resolver": "^5.6.0",
     "@veramo/key-manager": "^5.6.0",
     "@vueuse/core": "^10.9.0",
     "@zxing/text-encoding": "^0.9.0",
-    "asn1-ber": "^1.2.2",
     "axios": "^1.6.8",
-    "cbor-x": "^1.5.9",
     "class-transformer": "^0.5.1",
     "dexie": "^3.2.7",
     "dexie-export-import": "^4.1.1",
     "did-jwt": "^7.4.7",
     "ethereum-cryptography": "^2.1.3",
     "ethereumjs-util": "^7.1.5",
+    "ethr-did-resolver": "^8.1.2",
     "jdenticon": "^3.2.0",
     "js-generate-password": "^0.1.9",
     "js-yaml": "^4.1.0",
@@ -50,6 +46,7 @@
     "lru-cache": "^10.2.0",
     "luxon": "^3.4.4",
     "merkletreejs": "^0.3.11",
+    "moment": "^2.30.1",
     "notiwind": "^2.0.2",
     "papaparse": "^5.4.1",
     "pina": "^0.20.2204228",
@@ -66,17 +63,12 @@
     "vue": "^3.4.21",
     "vue-axios": "^3.5.2",
     "vue-facing-decorator": "^3.0.4",
-    "vue-picture-cropper": "^0.7.0",
     "vue-qrcode-reader": "^5.5.3",
     "vue-router": "^4.3.0",
     "web-did-resolver": "^2.0.27"
   },
   "devDependencies": {
-    "@playwright/test": "^1.45.2",
-    "@types/js-yaml": "^4.0.9",
     "@types/leaflet": "^1.9.8",
-    "@types/luxon": "^3.4.2",
-    "@types/node": "^20.14.11",
     "@types/ramda": "^0.29.11",
     "@types/three": "^0.155.1",
     "@types/ua-parser-js": "^0.7.39",
@@ -95,7 +87,6 @@
     "prettier": "^3.2.5",
     "tailwindcss": "^3.4.1",
     "typescript": "~5.2.2",
-    "vite": "^5.2.0",
-    "vite-plugin-pwa": "^0.19.8"
+    "vite": "^5.2.0"
   }
 }

playwright.config-local.ts

@@ -1,98 +0,0 @@
-import { defineConfig, devices } from '@playwright/test';
-
-/**
- * Read environment variables from file.
- * https://github.com/motdotla/dotenv
- */
-// import dotenv from 'dotenv';
-// dotenv.config({ path: path.resolve(__dirname, '.env') });
-
-/**
- * See https://playwright.dev/docs/test-configuration.
- */
-export default defineConfig({
-  testDir: './test-playwright',
-  /* Run tests in files in parallel */
-  fullyParallel: true,
-  /* Fail the build on CI if you accidentally left test.only in the source code. */
-  forbidOnly: !!process.env.CI,
-  /* Retry on CI only */
-  retries: process.env.CI ? 2 : 0,
-  /* Opt out of parallel tests on CI. */
-  workers: process.env.CI ? 1 : undefined,
-  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: 'html',
-  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-  use: {
-    /* Base URL to use in actions like `await page.goto('/')`. */
-    baseURL: 'http://localhost:8080',
-
-    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-    trace: 'on-first-retry',
-  },
-
-  /* Configure projects for major browsers */
-  projects: [
-    {
-      name: 'chromium',
-      use: {
-        ...devices['Desktop Chrome'],
-        permissions: ["clipboard-read"],
-      },
-    },
-
-    {
-      name: 'firefox',
-      use: { ...devices['Desktop Firefox'] },
-    },
-
-    {
-      name: 'webkit',
-      use: { ...devices['Desktop Safari'] },
-    },
-
-    /* Test against mobile viewports. */
-    {
-      name: 'Mobile Chrome',
-      use: { ...devices['Pixel 5'] },
-    },
-    {
-      name: 'Mobile Safari',
-      use: { ...devices['iPhone 12'] },
-    },
-
-    /* Test against branded browsers. */
-    // {
-    //   name: 'Microsoft Edge',
-    //   use: { ...devices['Desktop Edge'], channel: 'msedge' },
-    // },
-    {
-      name: 'Google Chrome',
-      use: { ...devices['Desktop Chrome'], channel: 'chrome' },
-    },
-  ],
-
-  /* Configure global timeout; default is 30000 milliseconds */
-  // the image upload will often not succeed at 5 seconds
-  //timeout: 10000,
-
-  /* Run your local dev server before starting the tests */
-  /**
-   * 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",
-   *       url: 'http://localhost:3000',
-   *       reuseExistingServer: !process.env.CI,
-   *     },
-   *
-   * But if we do then the testInfo.config.webServer is null and the API-setting test 00 fails.
-   * It is worth considering a change such that Time Safari's default Endorser API server is NOT set
-   * in the user's settings so that it can be blanked out and the default is used.
-   */
-  webServer: {
-    command:
-      "VITE_PASSKEYS_ENABLED=true VITE_DEFAULT_ENDORSER_API_SERVER=http://localhost:3000 npm run dev",
-    url: "http://localhost:8080",
-    reuseExistingServer: !process.env.CI,
-  },
-});

playwright.config.ts

@@ -1,82 +0,0 @@
-import { defineConfig, devices } from '@playwright/test';
-
-/**
- * Read environment variables from file.
- * https://github.com/motdotla/dotenv
- */
-// import dotenv from 'dotenv';
-// dotenv.config({ path: path.resolve(__dirname, '.env') });
-
-/**
- * See https://playwright.dev/docs/test-configuration.
- */
-export default defineConfig({
-  testDir: './test-playwright',
-  /* Run tests in files in parallel */
-  fullyParallel: true,
-  /* Fail the build on CI if you accidentally left test.only in the source code. */
-  forbidOnly: !!process.env.CI,
-  /* Retry on CI only */
-  retries: process.env.CI ? 2 : 0,
-  /* Opt out of parallel tests on CI. */
-  workers: process.env.CI ? 1 : undefined,
-  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: 'html',
-  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-  use: {
-    /* Base URL to use in actions like `await page.goto('/')`. */
-    baseURL: 'https://test.timesafari.app',
-
-    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-    trace: 'on-first-retry',
-  },
-
-  /* Configure projects for major browsers */
-  projects: [
-    {
-      name: 'chromium',
-      use: {
-        ...devices['Desktop Chrome'],
-        permissions: ["clipboard-read"],
-      },
-    },
-
-    {
-      name: 'firefox',
-      use: { ...devices['Desktop Firefox'] },
-    },
-
-    {
-      name: 'webkit',
-      use: { ...devices['Desktop Safari'] },
-    },
-
-    /* Test against mobile viewports. */
-    {
-      name: 'Mobile Chrome',
-      use: { ...devices['Pixel 5'] },
-    },
-    {
-      name: 'Mobile Safari',
-      use: { ...devices['iPhone 12'] },
-    },
-
-    /* Test against branded browsers. */
-    // {
-    //   name: 'Microsoft Edge',
-    //   use: { ...devices['Desktop Edge'], channel: 'msedge' },
-    // },
-    // {
-    //   name: 'Google Chrome',
-    //   use: { ...devices['Desktop Chrome'], channel: 'chrome' },
-    // },
-  ],
-
-  /* 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",
-  //   url: "http://localhost:8080",
-  //   reuseExistingServer: !process.env.CI,
-  // },
-});

project.task.yaml

@@ -1,4 +1,181 @@
 
 tasks :
 
-- This list has moved - see https://sharing.clickup.com/9014278710/l/h/6-901402735154-1/685f1be3f9b150d
+- fix the notification link to the app
+- 01 change scanning flow - allow them to stay on the QR/scanning screen after scanning someone
+
+- 24 contextual tutorials https://docs.google.com/document/d/11C_K3RM0rgo0onih20KFhcIzukZyq_CRWqaWX5om_kM/edit#heading=h.iwiwcydou5hw
+
+- feeds - add "remote" filter, if they choose 'visible' then warn that they won't see any others, cache list & don't reload front page on change
+
+- .1 add shortcut from project (etc?) to the public project page in a browser
+- .1 add KindSpring link to ideas
+- .1 on feed, don't show "to someone anonymous" if it's to a project
+- 16 save data backups in Google
+- 16 generate and use passkeys for identities
+- .5 show "give" buttons (eg. from anonymous) even if they can't give, greyed out, and give them a warning and instructions
+- .2 when adding a claim on home screen, push that claim to the top of the list
+
+- .2 fix give dialog from "more contacts" off home page to allow giving to this user
+- .5 stop from seeing an error on the first page when browser doesn't support service workers (which I've seen on iPhone; visible in Firefox private window)
+- .2 don't show a warning on a totally new project when the authorized agent is set
+- .2 anchor hash into BTC
+- .2 list the "show more" contacts alphabetically
+- .5 add back the explicit wait for browser subscription timing problems?
+
+- .5 make Time Safari a share_target for images
+
+- 08 add image on profile
+
+- 01 ask to detect location & record it in settings
+- 01 if personal location is set, show potential local affiliations
+- 02 refactor the buttons for chosing a search location so that the actions are clear assignee-group:ui
+
+- 24 compelling UI for credential presentations
+  - discover who in my network has activity on a project
+
+- 24 compelling UI for statistics (eg. World?)
+
+- 01 in the feed, group by project or contact or topic or time/$ (via BC); new projects, offers, search area, etc assignee-group:ui
+- 01 separate not-on-platform vs totally anonymous; terminology "unidentified"?
+- .2 add links between projects assignee-group:ui
+- 24 make the contact browsing on the front page something that invites more action
+
+- .5 change server plan & project endpoints to use jwtId as identifier rather than rowid
+- 16 edit offers & gives, or revoke allowing re-creation
+- .1 When available in the server, give message for 'nonAmountGiven' on offers on ProjectsView page.
+- .1 Add help instructions for "Encryption key has changed" error. (It is a problem if localStorage is cleared, but the contacts & settings remain and they have to restore their seeds.)
+- .1 show better error when user with no ID goes to the "My Project" page
+- 01 in front page prompt for ideas for gratitude :
+  - randomize (not show in order)
+  - checkboxes - show non-person-oriented messages, show only contacts, show only projects
+
+- .5 add a notice on the front page if their notifications are off
+- 08 allow user to add a time when they want their daily notification
+
+- .5 prompt for the name directly when they visit the QR scan page
+- 01 mark a project as inactive
+- 01 add share button for sending a message to confirmers when we can't see the claim (like the "visible" links)
+- .5 add TimeSafari as a shareable app https://developer.mozilla.org/en-US/docs/Web/Manifest/share_target
+- .5 choose a project's alternative agent ("authorized representative") via a contact chooser (not just copy-paste a DID)
+- .5 find out why clicking quickly back-and-forth onto the "my project" page often shows error "You need an identifier to load your projects." (easier to reproduce on desktop?)
+- .5 bug - it didn't show the "fulfills offer" on the claim detail page for a give that had one - https://test.timesafari.app/claim/01HMFWRPA3PD6Q9EYFKX3MC41J
+- 01 replace all "confirm" prompts with nicer modal
+- .1 hide project-create button on project page if not registered
+- .1 hide offer & give buttons on project list page if not registered
+- .1 add cursor-pointer on the icons for giving on the project page, and on the list of projects on the discover page
+- .2 record when InfiniteScroll hits the end of the list and don't trigger any more loads (feed, project list, give & offer lists)
+
+- bug (that is hard to reproduce) - got blank screen and errors on iPhone with no bottom tabs
+- bug - turning notifications on from the help screen did not stay, though account screen toggle did stay (From Jason on iPhone.)
+- refactor - supply the projectId to the OfferDialog just like we do with the GiftedDialog offerId (in the "open" method, maybe as well as an attribute)
+- the confirm button on each give on the ProjectViewView page doesn't have all the context of the ClaimView page, so it can show sometimes inappropriately; consider consolidation
+- make the "give" on contact screen work like other give (allowing donation vs current blank)
+- .2 on ClaimView, the "ask someone" should refer to "visible" IDs, or to confirmations only if confirmations are visible
+- message "send them to this page" on ClaimView should be a link (for installed app)
+- When we update a version, desktop browser users have seen nothing happen after clicking on the contact page QR and on the account page "Help"; errors show in the console. Reload fixed it. If this happens on mobile, ask the user to reload.
+
+- 01 show my VCs - most interesting, or via search
+- 04 allow user to download & prove chains of VCs, mine + ones I can see about me from others
+
+- revenue to support server operation
+
+- .1 copy button for seed
+- .5 If notifications are not enabled, add message to front page with link/button to enable
+- make server endpoint for full English description of limits
+- create a help-desk document & add screenshots
+
+- .1 update "offer" units to have same functionality as "give" units
+- .5 add a link to any 'give' records that fulfill an offer on ClaimView
+- 01 on home page, prompt for install check in addition to "supports notifications" check (since they won't get notified if Chrome is closed)
+- 01 on Mac (& Windows?) desktop, add a help blurb so that they can find it again (since it doesn't show in Application list)
+- bug (that is hard to reproduce) - got error adding on Firefox user #0 as contact for themselves
+- bug (that is hard to reproduce) - in Chrome, install app then delete app and try from Chrome browser and see log errors "Uncaught TypeError: self.appendDailyLog is not a function"
+- bug (that is hard to reproduce) - on the second 'give' recorded on prod it showed me as the agent
+- 04 remove 'rowid' references (that are sqlite-specific); may involve server
+- 04 look at other examples for better onboarding UI, eg friend.tech
+- .5 Add inactive flag / end date, start date to project
+- .3 check that Android shows "back" buttons on screens without bottom tray
+- .1 Make give description text box into something that expands as they type?
+- .2 Show a warning if both giver and recipient are the same (but still allow?)
+- .5 Shrink the buttons on project pages so they don't expand to the width of the screen assignee-group:ui
+- .5 Display a more appealing confirmation on the map when erasing the marker
+- .5 remove references to localStorage for projectId (now that it's pulling from the path)
+- switch some checks for activeDid to check for isRegistered
+- .2 in SeedBackupView, don't load the mnemonic and keep it in memory; only load it when they click "show"
+- .5 fix cert generation on server (since it didn't happen automatically for Nov 30)
+- warn if they're using the web (android only?)
+  https://developer.mozilla.org/en-US/docs/Web/API/Navigator/getInstalledRelatedApps
+  https://web.dev/articles/get-installed-related-apps
+- .5 fix the "onboarding help" list of instructions so that it always formats right (currently doesn't show numbers aligned on Google Pixel 6a, iPhone 11 Pro, iPhone 12 mini)
+- .5 make the "onboarding help" it so that it doesn't cover the QR icon on the contacts page
+- .5 fix masked icon (because some of the top-right of the binoculars is cut off)
+
+- contacts v+ :
+  - 01 Import all the non-sensitive data (ie. contacts & settings).
+  - .2 show error to user when adding a duplicate contact
+  - 01 parse input more robustly (with CSV lib and not commas)
+
+- stats v1 :
+  - 01 show numeric stats
+  - 04 show different graphic for projects vs people (gnome?) on world
+  - 01 link to world for specific stats
+  - .5 don't load another instance of a bush if it already exists
+  - maybe - allow type annotations in World.js & landmarks.js (since we get this error - "Types are not supported by current JavaScript version")
+  - 08 convert to cleaner implementation (maybe Drie -- https://github.com/janvorisek/drie)
+
+- .5 show seed phrase in a QR code for transfer to another device
+- .5 on DiscoverView, switch to a filter UI (eg. just from friend)
+- .5 don't show "Offer" on project screen if they aren't registered
+- 01 especially for iOS, check for new version & update, eg. https://stackoverflow.com/questions/52221805/any-way-yet-to-auto-update-or-just-clear-the-cache-on-a-pwa-on-ios
+
+- 24 allow a person record with interests, including location; purpose? contact methods? enhance other connections the same? (suggestion from Philippines) assignee-group:ui
+- 24 brief introduction slides https://docs.google.com/document/d/11C_K3RM0rgo0onih20KFhcIzukZyq_CRWqaWX5om_kM/edit#heading=h.iwiwcydou5hw
+- 12 feedback https://docs.google.com/document/d/11C_K3RM0rgo0onih20KFhcIzukZyq_CRWqaWX5om_kM/edit#heading=h.iwiwcydou5hw
+
+- 32 accept images for projects
+- 32 accept images for contacts
+- import project interactions from GitHub/GitLab and manage signing
+
+- show total time offered to & fulfilled to a project
+- show total time offered by & fulfilled by a contact
+
+- linking between projects or plans :
+  - show total time given to & from a project
+  - terminology:
+    - for subtasks: fulfills (is it really the same?), feeds, contributes to, supplies, boosts, advances
+    - for blocking: blocks, precedes, comes before, is sought by -- vs follows, seeks, builds on ("contributes to" isn't specific enough, "succeeds" has different, possibly confusing meaning)
+
+- .5 Replace Gifted/Give in ContactsView with GiftedDialog
+
+- Stats :
+  - 01 point out user's location on the world
+  - 01 present a credential selected from the stats
+  - 04 show gives spreading to other places
+  - badge for most gives/receives/confirms per day/week/month
+  - badge for amount given/offered to your project
+  - set a goal of given/offers
+
+- automated tests, eg. pup-test or cypress
+
+- Notifications (wake on the phone, push notifications)
+  - 02 change push server so that the web-push/subscribe call sets up a thread for the 10-seconds-later push notification, but returns immediately to the callee
+  - pull instead of push, maybe via scheduled runs
+  - have a notification pop-up on Mac screen
+
+- 16 Connect with phone contacts - this may be a whole different app, because we want a quick link A) to the same phone contact and B) from the phone contact app
+
+- Support KERI AIDs
+- Support Peer DIDs
+- Support messaging through DIDComm
+- Write to or read from a different ledger (eg. private ACDC, EAS & attest.sh)
+
+- 01 On nearby search, if user starts changing their box but cancels and goes back to the map it is zoomed far out. Fix to fit the box better.
+
+- allow some gives even if they aren't registered - maybe someday as a gift to the world, but we really want this to be built via personal connections -- and that allows spam
+- .1 When Chrome shows compatibility https://developer.mozilla.org/en-US/docs/Web/API/Web_Share_API#api.navigator.canshare
+  then change the canShare check in this app to check the real canShare() method.
+
+log :
+- videos for multiple identities https://youtu.be/p8L87AeD76w and for adding time to contacts https://youtu.be/7Yylczevp10 done:2023-03-29
+- project lists, contact totals & actions, multiple identifiers, stats-world, activity feed, rename of this project file (use "--follow --") milestone:2 done:2023-06-27

src/App.vue

@@ -129,10 +129,7 @@
     </div>
   </NotificationGroup>
 
-  <!--
-    This "group" of "modal" is the prompt for an answer.
-    Set "type" as follows: "confirm" for yes/no, and "notification" ones: "-permission", "-mute", "-off"
-  -->
+  <!-- These are general-purpose messages - except there are some for turning app notifications on and off. -->
   <NotificationGroup group="modal">
     <div class="fixed z-[100] top-0 inset-x-0 w-full">
       <Notification
@@ -146,19 +143,13 @@
         move="transition duration-500"
         move-delay="delay-300"
       >
-        <!-- see NotificationIface in constants/app.ts -->
         <div
           v-for="notification in notifications"
           :key="notification.id"
           class="w-full"
           role="alert"
         >
-          <!--
-           Type of "confirm" will post a message.
-           With onYes function, show a "Yes" button to call that function.
-           With onNo function, show a "No" button to call that function,
-             and pass it state of "askAgain" field shown if you set promptToStopAsking.
-          -->
+          <!-- type "confirm" will post a message and, with onYes function, show a "Yes" button to call that function -->
           <div
             v-if="notification.type === 'confirm'"
             class="absolute inset-0 h-screen flex flex-col items-center justify-center bg-slate-900/50"
@@ -167,10 +158,9 @@
               class="flex w-11/12 max-w-sm mx-auto mb-3 overflow-hidden bg-white rounded-lg shadow-lg"
             >
               <div class="w-full px-6 py-6 text-slate-900 text-center">
-                <span class="font-semibold text-lg">
+                <p class="text-lg mb-4">
                   {{ notification.title }}
-                </span>
-                <p class="text-sm mb-2">{{ notification.text }}</p>
+                </p>
 
                 <button
                   v-if="notification.onYes"
@@ -181,55 +171,10 @@
                   class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white px-2 py-2 rounded-md mb-2"
                 >
                   Yes
-                  {{ notification.yesText ? ", " + notification.yesText : "" }}
                 </button>
 
                 <button
-                  v-if="notification.onNo"
-                  @click="
-                    notification.onNo(stopAsking);
-                    close(notification.id);
-                    stopAsking = false; // reset value
-                  "
-                  class="block w-full text-center text-md font-bold uppercase bg-yellow-600 text-white px-2 py-2 rounded-md mb-2"
-                >
-                  No {{ notification.noText ? ", " + notification.noText : "" }}
-                </button>
-
-                <label
-                  v-if="notification.promptToStopAsking && notification.onNo"
-                  for="toggleStopAsking"
-                  class="flex items-center justify-between cursor-pointer my-4"
-                  @click="stopAsking = !stopAsking"
-                >
-                  <!-- label -->
-                  <span class="ml-2">... and do not ask again.</span>
-                  <!-- toggle -->
-                  <div class="relative ml-2">
-                    <!-- input -->
-                    <input
-                      type="checkbox"
-                      v-model="stopAsking"
-                      name="stopAsking"
-                      class="sr-only"
-                    />
-                    <!-- line -->
-                    <div class="block bg-slate-500 w-14 h-8 rounded-full"></div>
-                    <!-- dot -->
-                    <div
-                      class="dot absolute left-1 top-1 bg-slate-400 w-6 h-6 rounded-full transition"
-                    ></div>
-                  </div>
-                </label>
-
-                <button
-                  @click="
-                    notification.onCancel
-                      ? notification.onCancel(stopAsking)
-                      : null;
-                    close(notification.id);
-                    stopAsking = false; // reset value
-                  "
+                  @click="close(notification.id)"
                   class="block w-full text-center text-md font-bold uppercase bg-slate-600 text-white px-2 py-2 rounded-md"
                 >
                   {{ notification.onYes ? "Cancel" : "Close" }}
@@ -413,7 +358,6 @@ import { sendTestThroughPushServer } from "@/libs/util";
 export default class App extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
 
-  stopAsking = false;
   b64 = "";
   hourAm = true;
   hourInput = "8";

src/components/EntityIcon.vue

@@ -5,36 +5,20 @@
 import { createAvatar, StyleOptions } from "@dicebear/core";
 import { avataaars } from "@dicebear/collection";
 import { Vue, Component, Prop } from "vue-facing-decorator";
-import { Contact } from "@/db/tables/contacts";
 
 @Component
 export default class EntityIcon extends Vue {
-  @Prop contact: Contact;
-  @Prop entityId = ""; // overridden by contact.did or profileImageUrl
+  @Prop entityId = "";
   @Prop iconSize = 0;
-  @Prop profileImageUrl = ""; // overridden by contact.profileImageUrl
 
   generateIcon() {
-    const imageUrl = this.contact?.profileImageUrl || this.profileImageUrl;
-    if (imageUrl) {
-      return `<img src="${imageUrl}" class="rounded" width="${this.iconSize}" height="${this.iconSize}" />`;
-    } else {
-      const identifier = this.contact?.did || this.entityId;
-      if (!identifier) {
-        return `<img src="../src/assets/blank-square.svg" class="rounded" width="${this.iconSize}" height="${this.iconSize}" />`;
-      }
-      // https://api.dicebear.com/8.x/avataaars/svg?seed=
-      // ... does not render things with the same seed as this library.
-      // "did:ethr:0x222BB77E6Ff3774d34c751f3c1260866357B677b" yields a girl with flowers in her hair and a lightning earring
-      // ... which looks similar to '' at the dicebear site but which is different.
-      const options: StyleOptions<object> = {
-        seed: (identifier as string) || "",
-        size: this.iconSize,
-      };
-      const avatar = createAvatar(avataaars, options);
-      const svgString = avatar.toString();
-      return svgString;
-    }
+    const options: StyleOptions<object> = {
+      seed: this.entityId || "",
+      size: this.iconSize,
+    };
+    const avatar = createAvatar(avataaars, options);
+    const svgString = avatar.toString();
+    return svgString;
   }
 }
 </script>

src/components/FeedFilters.vue

@@ -133,18 +133,18 @@ export default class FeedFilters extends Vue {
     this.visible = true;
   }
 
-  async toggleHasVisibleDid() {
+  toggleHasVisibleDid() {
     this.settingChanged = true;
     this.hasVisibleDid = !this.hasVisibleDid;
-    await db.settings.update(MASTER_SETTINGS_KEY, {
+    db.settings.update(MASTER_SETTINGS_KEY, {
       filterFeedByVisible: this.hasVisibleDid,
     });
   }
 
-  async toggleNearby() {
+  toggleNearby() {
     this.settingChanged = true;
     this.isNearby = !this.isNearby;
-    await db.settings.update(MASTER_SETTINGS_KEY, {
+    db.settings.update(MASTER_SETTINGS_KEY, {
       filterFeedByNearby: this.isNearby,
     });
   }
@@ -154,7 +154,7 @@ export default class FeedFilters extends Vue {
       this.settingChanged = true;
     }
 
-    await db.settings.update(MASTER_SETTINGS_KEY, {
+    db.settings.update(MASTER_SETTINGS_KEY, {
       filterFeedByNearby: false,
       filterFeedByVisible: false,
     });
@@ -168,7 +168,7 @@ export default class FeedFilters extends Vue {
       this.settingChanged = true;
     }
 
-    await db.settings.update(MASTER_SETTINGS_KEY, {
+    db.settings.update(MASTER_SETTINGS_KEY, {
       filterFeedByNearby: true,
       filterFeedByVisible: true,
     });

src/components/GiftedDialog.vue

@@ -2,12 +2,12 @@
   <div v-if="visible" class="dialog-overlay">
     <div class="dialog">
       <h1 class="text-xl font-bold text-center mb-4">
-        {{ customTitle }}
+        {{ message }} {{ giver?.name || "somebody not named" }}
       </h1>
       <input
         type="text"
         class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
-        placeholder="What was given"
+        placeholder="What was received"
         v-model="description"
       />
       <div class="flex flex-row justify-center">
@@ -15,7 +15,7 @@
           class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center text-blue-500 px-2 py-2 w-20"
           @click="changeUnitCode()"
         >
-          {{ libsUtil.UNIT_SHORT[unitCode] || unitCode }}
+          {{ libsUtil.UNIT_SHORT[unitCode] }}
         </span>
         <div
           class="border border-r-0 border-slate-400 bg-slate-200 px-4 py-2"
@@ -24,7 +24,6 @@
           <fa icon="chevron-left" />
         </div>
         <input
-          id="inputGivenAmount"
           type="number"
           class="border border-r-0 border-slate-400 px-2 py-2 text-center w-20"
           v-model="amountInput"
@@ -46,16 +45,15 @@
                 description,
                 giverDid: giver?.did,
                 giverName: giver?.name,
+                message,
                 offerId,
                 projectId,
-                recipientDid: receiver?.did,
-                recipientName: receiver?.name,
                 unitCode,
               },
             }"
             class="text-blue-500"
           >
-            Photo & more options ...
+            Photo, ...
           </router-link>
         </span>
       </div>
@@ -92,7 +90,7 @@ import { NotificationIface } from "@/constants/app";
 import {
   createAndSubmitGive,
   didInfo,
-  GiverReceiverInputInfo,
+  GiverInputInfo,
 } from "@/libs/endorserServer";
 import * as libsUtil from "@/libs/util";
 import { accountsDB, db } from "@/db/index";
@@ -103,7 +101,9 @@ import { Contact } from "@/db/tables/contacts";
 export default class GiftedDialog extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
 
+  @Prop message = "";
   @Prop projectId = "";
+  @Prop showGivenToUser = false;
 
   activeDid = "";
   allContacts: Array<Contact> = [];
@@ -111,32 +111,22 @@ export default class GiftedDialog extends Vue {
   apiServer = "";
 
   amountInput = "0";
-  callbackOnSuccess?: (amount: number) => void = () => {};
-  customTitle?: string;
   description = "";
-  giver?: GiverReceiverInputInfo; // undefined means no identified giver agent
+  givenToUser = false;
+  giver?: GiverInputInfo; // undefined means no identified giver agent
   isTrade = false;
   offerId = "";
-  receiver?: GiverReceiverInputInfo;
   unitCode = "HUR";
   visible = false;
 
   libsUtil = libsUtil;
 
-  async open(
-    giver?: GiverReceiverInputInfo,
-    receiver?: GiverReceiverInputInfo,
-    offerId?: string,
-    customTitle?: string,
-    callbackOnSuccess?: (amount: number) => void,
-  ) {
-    this.customTitle = customTitle;
+  async open(giver?: GiverInputInfo, offerId?: string) {
     this.description = "";
-    this.giver = giver;
-    this.receiver = receiver;
+    this.giver = giver || {};
     // if we show "given to user" selection, default checkbox to true
+    this.givenToUser = this.showGivenToUser;
     this.amountInput = "0";
-    this.callbackOnSuccess = callbackOnSuccess;
     this.offerId = offerId || "";
 
     try {
@@ -151,7 +141,7 @@ export default class GiftedDialog extends Vue {
       const allAccounts = await accountsDB.accounts.toArray();
       this.allMyDids = allAccounts.map((acc) => acc.did);
 
-      if (this.giver && !this.giver.name) {
+      if (!this.giver.name) {
         this.giver.name = didInfo(
           this.giver.did,
           this.activeDid,
@@ -206,6 +196,7 @@ export default class GiftedDialog extends Vue {
   eraseValues() {
     this.description = "";
     this.giver = undefined;
+    this.givenToUser = this.showGivenToUser;
     this.amountInput = "0";
     this.unitCode = "HUR";
   }
@@ -263,7 +254,6 @@ export default class GiftedDialog extends Vue {
     // this is asynchronous, but we don't need to wait for it to complete
     await this.recordGive(
       (this.giver?.did as string) || null,
-      (this.receiver?.did as string) || null,
       this.description,
       parseFloat(this.amountInput),
       this.unitCode,
@@ -275,27 +265,26 @@ export default class GiftedDialog extends Vue {
   /**
    *
    * @param giverDid may be null
-   * @param recipientDid may be null
    * @param description may be an empty string
-   * @param amount may be 0
+   * @param amountInput may be 0
    * @param unitCode may be omitted, defaults to "HUR"
    */
-  async recordGive(
+  public async recordGive(
     giverDid: string | null,
-    recipientDid: string | null,
     description: string,
-    amount: number,
+    amountInput: number,
     unitCode: string = "HUR",
   ) {
     try {
+      const identity = await libsUtil.getIdentity(this.activeDid);
       const result = await createAndSubmitGive(
         this.axios,
         this.apiServer,
-        this.activeDid,
-        giverDid as string,
-        recipientDid as string,
+        identity,
+        giverDid,
+        this.givenToUser ? this.activeDid : undefined,
         description,
-        amount,
+        amountInput,
         unitCode,
         this.projectId,
         this.offerId,
@@ -327,14 +316,11 @@ export default class GiftedDialog extends Vue {
           },
           7000,
         );
-        if (this.callbackOnSuccess) {
-          this.callbackOnSuccess(amount);
-        }
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (error: any) {
       console.error("Error with give recordation caught:", error);
-      const errorMessage =
+      const message =
         error.userMessage ||
         error.response?.data?.error?.message ||
         "There was an error recording the give.";
@@ -343,7 +329,7 @@ export default class GiftedDialog extends Vue {
           group: "alert",
           type: "danger",
           title: "Error",
-          text: errorMessage,
+          text: message,
         },
         -1,
       );

src/components/GiftedPhotoDialog.vue

@@ -4,7 +4,7 @@
       <div class="text-lg text-center font-light relative z-50">
         <div
           id="ViewHeading"
-          class="text-center font-bold absolute top-0 left-0 right-0 px-4 py-0.5 bg-black/50 text-white leading-none"
+          class="text-center font-bold absolute top-0 left-0 right-0 px-4 py-2 bg-black/50 text-white leading-none"
         >
           <span v-if="uploading"> Uploading... </span>
           <span v-else-if="blob"> Look Good? </span>
@@ -12,7 +12,7 @@
         </div>
 
         <div
-          class="text-lg text-center px-2 py-0.5 leading-none absolute right-0 top-0 text-white"
+          class="text-lg text-center p-2 leading-none absolute right-0 top-0 text-white"
           @click="close()"
         >
           <fa icon="xmark" class="w-[1em]"></fa>
@@ -20,59 +20,28 @@
       </div>
 
       <div v-if="uploading" class="flex justify-center">
-        <fa
-          icon="spinner"
-          class="fa-spin fa-3x text-center block px-12 py-12"
-        />
+        <fa icon="spinner" class="fa-spin fa-3x text-center block" />
       </div>
       <div v-else-if="blob">
-        <div v-if="crop">
-          <VuePictureCropper
-            :boxStyle="{
-              backgroundColor: '#f8f8f8',
-              margin: 'auto',
-            }"
-            :img="createBlobURL(blob)"
-            :options="{
-              viewMode: 1,
-              dragMode: 'crop',
-              aspectRatio: 9 / 9,
-            }"
-            class="max-h-[90vh] max-w-[90vw] object-contain"
-          />
-          <!-- This gives a round cropper.
-            :presetMode="{
-              mode: 'round',
-            }"
-          -->
-        </div>
-        <div v-else>
-          <div class="flex justify-center">
-            <img
-              :src="createBlobURL(blob)"
-              class="mt-2 rounded max-h-[90vh] max-w-[90vw] object-contain"
-            />
-          </div>
-        </div>
-        <div class="absolute bottom-[1rem] left-[1rem] px-2 py-1">
+        <div
+          class="flex justify-center gap-2 absolute bottom-[1rem] left-[1rem] right-[1rem] bg-black/50 px-4 py-2"
+        >
           <button
             @click="uploadImage"
-            class="bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white py-1 px-2 rounded-md"
+            class="bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white font-bold py-2 px-4 rounded-md"
           >
             <span>Upload</span>
           </button>
-        </div>
-        <div
-          v-if="showRetry"
-          class="absolute bottom-[1rem] right-[1rem] px-2 py-1"
-        >
           <button
             @click="retryImage"
-            class="bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white py-1 px-2 rounded-md"
+            class="bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white font-bold py-2 px-4 rounded-md"
           >
             <span>Retry</span>
           </button>
         </div>
+        <div class="flex justify-center">
+          <img :src="URL.createObjectURL(blob)" class="mt-2 rounded" />
+        </div>
       </div>
       <div v-else ref="cameraContainer">
         <!--
@@ -123,27 +92,23 @@
 import axios from "axios";
 import Camera from "simple-vue-camera";
 import { Component, Vue } from "vue-facing-decorator";
-import VuePictureCropper, { cropper } from "vue-picture-cropper";
 
 import { DEFAULT_IMAGE_API_SERVER, NotificationIface } from "@/constants/app";
+import { getIdentity } from "@/libs/util";
 import { db } from "@/db/index";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
 
-@Component({ components: { Camera, VuePictureCropper } })
-export default class PhotoDialog extends Vue {
+@Component({ components: { Camera } })
+export default class GiftedPhotoDialog extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   activeDeviceNumber = 0;
   activeDid = "";
-  blob?: Blob;
-  claimType = "";
-  crop = false;
-  fileName?: string;
+  blob: Blob | null = null;
   mirror = false;
   numDevices = 0;
-  setImageCallback: (arg: string) => void = () => {};
-  showRetry = true;
+  setImage: (arg: string) => void = () => {};
   uploading = false;
   visible = false;
 
@@ -169,31 +134,13 @@ export default class PhotoDialog extends Vue {
     }
   }
 
-  open(
-    setImageFn: (arg: string) => void,
-    claimType: string,
-    crop?: boolean,
-    blob?: Blob, // for image upload, just to use the cropping function
-    inputFileName?: string,
-  ) {
+  open(setImageFn: (arg: string) => void) {
     this.visible = true;
-    this.claimType = claimType;
-    this.crop = !!crop;
     const bottomNav = document.querySelector("#QuickNav") as HTMLElement;
     if (bottomNav) {
       bottomNav.style.display = "none";
     }
-    this.setImageCallback = setImageFn;
-    if (blob) {
-      this.blob = blob;
-      this.fileName = inputFileName;
-      // doesn't make sense to retry the file upload; they can cancel if they picked the wrong one
-      this.showRetry = false;
-    } else {
-      this.blob = undefined;
-      this.fileName = undefined;
-      this.showRetry = true;
-    }
+    this.setImage = setImageFn;
   }
 
   close() {
@@ -202,7 +149,7 @@ export default class PhotoDialog extends Vue {
     if (bottomNav) {
       bottomNav.style.display = "";
     }
-    this.blob = undefined;
+    this.blob = null;
   }
 
   async cameraStarted() {
@@ -210,12 +157,6 @@ export default class PhotoDialog extends Vue {
     if (cameraComponent) {
       this.numDevices = (await cameraComponent.devices(["videoinput"])).length;
       this.mirror = cameraComponent.facingMode === "user";
-      // figure out which device is active
-      const currentDeviceId = cameraComponent.currentDeviceID();
-      const devices = await cameraComponent.devices(["videoinput"]);
-      this.activeDeviceNumber = devices.findIndex(
-        (device) => device.deviceId === currentDeviceId,
-      );
     }
   }
 
@@ -223,9 +164,7 @@ export default class PhotoDialog extends Vue {
     const cameraComponent = this.$refs.camera as InstanceType<typeof Camera>;
     this.activeDeviceNumber = (this.activeDeviceNumber + 1) % this.numDevices;
     const devices = await cameraComponent?.devices(["videoinput"]);
-    await cameraComponent?.changeCamera(
-      devices[this.activeDeviceNumber].deviceId,
-    );
+    cameraComponent?.changeCamera(devices[this.activeDeviceNumber].deviceId);
   }
 
   async takeImage(/* payload: MouseEvent */) {
@@ -266,13 +205,10 @@ export default class PhotoDialog extends Vue {
 
     // The resolution is only necessary because of that mobile portrait-orientation case.
     // The mobile emulation in a browser shows something stretched vertically, but real devices work fine.
-    this.blob =
-      (await cameraComponent?.snapshot({
-        height: imageHeight,
-        width: imageWidth,
-      })) || undefined;
-    // png is default
-    this.fileName = "snapshot.png";
+    this.blob = await cameraComponent?.snapshot({
+      height: imageHeight,
+      width: imageWidth,
+    }); // png is default; if that changes, change extension in formData.append
     if (!this.blob) {
       this.$notify(
         {
@@ -287,12 +223,8 @@ export default class PhotoDialog extends Vue {
     }
   }
 
-  private createBlobURL(blob: Blob): string {
-    return URL.createObjectURL(blob);
-  }
-
   async retryImage() {
-    this.blob = undefined;
+    this.blob = null;
   }
 
   /****
@@ -342,15 +274,10 @@ export default class PhotoDialog extends Vue {
 
   async uploadImage() {
     this.uploading = true;
-
-    if (this.crop) {
-      this.blob = (await cropper?.getBlob()) || undefined;
-    }
-
-    const token = await accessToken(this.activeDid);
+    const identifier = await getIdentity(this.activeDid);
+    const token = await accessToken(identifier);
     const headers = {
       Authorization: "Bearer " + token,
-      // axios fills in Content-Type of multipart/form-data
     };
     const formData = new FormData();
     if (!this.blob) {
@@ -367,8 +294,8 @@ export default class PhotoDialog extends Vue {
       this.uploading = false;
       return;
     }
-    formData.append("image", this.blob, this.fileName || "snapshot.png");
-    formData.append("claimType", this.claimType);
+    formData.append("image", this.blob, "snapshot.png"); // png is set in snapshot()
+    formData.append("claimType", "GiveAction");
     try {
       const response = await axios.post(
         DEFAULT_IMAGE_API_SERVER + "/image",
@@ -377,8 +304,9 @@ export default class PhotoDialog extends Vue {
       );
       this.uploading = false;
 
-      this.close();
-      this.setImageCallback(response.data.url as string);
+      this.visible = false;
+      this.blob = null;
+      this.setImage(response.data.url as string);
     } catch (error) {
       console.error("Error uploading the image", error);
       this.$notify(
@@ -386,12 +314,12 @@ export default class PhotoDialog extends Vue {
           group: "alert",
           type: "danger",
           title: "Error",
-          text: "There was an error saving the picture.",
+          text: "There was an error saving the picture. Please try again.",
         },
         5000,
       );
       this.uploading = false;
-      this.blob = undefined;
+      this.blob = null;
     }
   }
 

src/components/ImageMethodDialog.vue

@@ -1,177 +0,0 @@
-<template>
-  <div v-if="visible" class="dialog-overlay z-[60]">
-    <div class="dialog relative">
-      <div class="text-lg text-center font-light relative z-50">
-        <div
-          id="ViewHeading"
-          class="text-center font-bold absolute top-0 left-0 right-0 px-4 py-0.5 bg-black/50 text-white leading-none"
-        >
-          Camera or Other?
-        </div>
-        <div
-          class="text-lg text-center px-2 py-0.5 leading-none absolute right-0 top-0 text-white"
-          @click="close()"
-        >
-          <fa icon="xmark" class="w-[1em]"></fa>
-        </div>
-      </div>
-
-      <div>
-        <div class="text-center mt-8">
-          <div class>
-            <fa
-              icon="camera"
-              class="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-2 py-2 rounded-md"
-              @click="openPhotoDialog()"
-            />
-          </div>
-          <div class="mt-4">
-            <input type="file" @change="uploadImageFile" />
-          </div>
-          <div class="mt-4">
-            <span class="mt-2">
-              ... or paste a URL:
-              <input type="text" v-model="imageUrl" class="border-2" />
-            </span>
-            <span class="ml-2">
-              <fa
-                v-if="imageUrl"
-                icon="check"
-                class="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-2 py-2 rounded-md cursor-pointer"
-                @click="acceptUrl"
-              />
-              <!-- so that there's no shifting when it becomes visible -->
-              <fa v-else icon="check" class="text-white bg-white px-2 py-2" />
-            </span>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <PhotoDialog ref="photoDialog" />
-</template>
-
-<script lang="ts">
-import axios from "axios";
-import { ref } from "vue";
-import { Component, Vue } from "vue-facing-decorator";
-
-import PhotoDialog from "@/components/PhotoDialog.vue";
-import { NotificationIface } from "@/constants/app";
-
-const inputImageFileNameRef = ref<Blob>();
-
-@Component({
-  components: { PhotoDialog },
-})
-export default class ImageMethodDialog extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-
-  claimType: string;
-  crop: boolean = false;
-  imageCallback: (imageUrl?: string) => void = () => {};
-  imageUrl?: string;
-  visible = false;
-
-  open(setImageFn: (arg: string) => void, claimType: string, crop?: boolean) {
-    this.claimType = claimType;
-    this.crop = !!crop;
-    this.imageCallback = setImageFn;
-
-    this.visible = true;
-  }
-
-  openPhotoDialog(blob?: Blob, fileName?: string) {
-    this.visible = false;
-
-    (this.$refs.photoDialog as PhotoDialog).open(
-      this.imageCallback,
-      this.claimType,
-      this.crop,
-      blob,
-      fileName,
-    );
-  }
-
-  async uploadImageFile(event: Event) {
-    this.visible = false;
-
-    inputImageFileNameRef.value = event.target.files[0];
-    // https://developer.mozilla.org/en-US/docs/Web/API/File
-    // ... plus it has a `type` property from my testing
-    const file = inputImageFileNameRef.value;
-    if (file != null) {
-      const reader = new FileReader();
-      reader.onload = async (e) => {
-        const data = e.target?.result as ArrayBuffer;
-        if (data) {
-          const blob = new Blob([new Uint8Array(data)], {
-            type: file.type,
-          });
-          this.openPhotoDialog(blob, file.name as string);
-        }
-      };
-      reader.readAsArrayBuffer(file as Blob);
-    }
-  }
-
-  async acceptUrl() {
-    this.visible = false;
-    if (this.crop) {
-      try {
-        const urlBlobResponse: Blob = await axios.get(this.imageUrl as string, {
-          responseType: "blob", // This ensures the data is returned as a Blob
-        });
-        const fullUrl = new URL(this.imageUrl as string);
-        const fileName = fullUrl.pathname.split("/").pop() as string;
-        (this.$refs.photoDialog as PhotoDialog).open(
-          this.imageCallback,
-          this.claimType,
-          this.crop,
-          urlBlobResponse.data as Blob,
-          fileName,
-        );
-      } catch (error) {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "There was an error retrieving that image.",
-          },
-          5000,
-        );
-      }
-    } else {
-      this.imageCallback(this.imageUrl);
-    }
-  }
-
-  close() {
-    this.visible = false;
-  }
-}
-</script>
-
-<style>
-.dialog-overlay {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(0, 0, 0, 0.5);
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding: 1.5rem;
-}
-
-.dialog {
-  background-color: white;
-  padding: 1rem;
-  border-radius: 0.5rem;
-  width: 100%;
-  max-width: 700px;
-}
-</style>

src/components/OfferDialog.vue

@@ -4,7 +4,6 @@
       <h1 class="text-xl font-bold text-center mb-4">Offer Help</h1>
       <input
         type="text"
-        data-testId="inputDescription"
         class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
         placeholder="Description, prerequisites, terms, etc."
         v-model="description"
@@ -24,7 +23,6 @@
           <fa icon="chevron-left" />
         </div>
         <input
-          data-testId="inputOfferAmount"
           type="number"
           class="w-full border border-r-0 border-slate-400 px-2 py-2 text-center"
           v-model="amountInput"
@@ -36,27 +34,18 @@
           <fa icon="chevron-right" />
         </div>
       </div>
-      <div class="mt-4 flex justify-center">
-        <span>
-          <router-link
-            :to="{
-              name: 'offer-details',
-              query: {
-                amountInput,
-                description,
-                offererDid: activeDid,
-                projectId,
-                projectName,
-                recipientDid,
-                recipientName,
-                unitCode: amountUnitCode,
-              },
-            }"
-            class="text-blue-500"
-          >
-            Conditions & more options...
-          </router-link>
+      <div class="flex flex-row mt-2">
+        <span
+          class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center px-2 py-2"
+        >
+          Expiration
         </span>
+        <input
+          type="text"
+          class="w-full border border-slate-400 px-2 py-2 rounded-r"
+          :placeholder="'Date, eg. ' + new Date().toISOString().slice(0, 10)"
+          v-model="expirationDateInput"
+        />
       </div>
       <p class="text-center mt-6 mb-2 italic">
         Sign & Send to publish to the world
@@ -92,8 +81,8 @@ import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 export default class OfferDialog extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
 
-  @Prop projectId?;
-  @Prop projectName?;
+  @Prop message = "";
+  @Prop projectId = "";
 
   activeDid = "";
   apiServer = "";
@@ -102,22 +91,16 @@ export default class OfferDialog extends Vue {
   amountUnitCode = "HUR";
   description = "";
   expirationDateInput = "";
-  recipientDid? = "";
-  recipientName? = "";
   visible = false;
 
   libsUtil = libsUtil;
 
-  async open(recipientDid?: string, recipientName?: string) {
+  async open() {
     try {
-      this.recipientDid = recipientDid;
-      this.recipientName = recipientName;
-
       await db.open();
       const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
       this.apiServer = settings?.apiServer || "";
       this.activeDid = settings?.activeDid || "";
-
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
       console.error("Error retrieving settings from database:", err);
@@ -230,15 +213,15 @@ export default class OfferDialog extends Vue {
     }
 
     try {
+      const identity = await libsUtil.getIdentity(this.activeDid);
       const result = await createAndSubmitOffer(
         this.axios,
         this.apiServer,
-        this.activeDid,
+        identity,
         description,
         amount,
         unitCode,
         expirationDateInput,
-        this.recipientDid,
         this.projectId,
       );
 

src/components/ProjectIcon.vue

@@ -1,17 +1,5 @@
 <template>
-  <a
-    v-if="linkToFull && imageUrl"
-    :href="imageUrl"
-    target="_blank"
-    class="h-full w-full object-contain"
-  >
-    <div v-html="generateIdenticon()" class="h-full w-full object-contain" />
-  </a>
-  <div
-    v-else
-    v-html="generateIdenticon()"
-    class="h-full w-full object-contain"
-  />
+  <div v-html="generateIdenticon()" class="w-fit"></div>
 </template>
 <script lang="ts">
 import { toSvg } from "jdenticon";
@@ -33,17 +21,11 @@ const BLANK_CONFIG = {
 export default class ProjectIcon extends Vue {
   @Prop entityId = "";
   @Prop iconSize = 0;
-  @Prop imageUrl = "";
-  @Prop linkToFull = false;
 
   generateIdenticon() {
-    if (this.imageUrl) {
-      return `<img src="${this.imageUrl}" class="w-full h-full object-contain" />`;
-    } else {
-      const config = this.entityId ? undefined : BLANK_CONFIG;
-      const svgString = toSvg(this.entityId, this.iconSize, config);
-      return svgString;
-    }
+    const config = this.entityId ? undefined : BLANK_CONFIG;
+    const svgString = toSvg(this.entityId, this.iconSize, config);
+    return svgString;
   }
 }
 </script>

src/components/QuickNav.vue

@@ -12,7 +12,7 @@
         }"
       >
         <router-link :to="{ name: 'home' }" class="block text-center py-3 px-1">
-          <fa icon="house-chimney" class="fa-fw" />
+          <fa icon="house-chimney" class="fa-fw"></fa>
         </router-link>
       </li>
       <!-- Search -->
@@ -28,7 +28,7 @@
           :to="{ name: 'discover' }"
           class="block text-center py-3 px-1"
         >
-          <fa icon="magnifying-glass" class="fa-fw" />
+          <fa icon="magnifying-glass" class="fa-fw"></fa>
         </router-link>
       </li>
       <!-- Projects -->
@@ -44,7 +44,7 @@
           :to="{ name: 'projects' }"
           class="block text-center py-3 px-1"
         >
-          <fa icon="hand" class="fa-fw" />
+          <fa icon="folder-open" class="fa-fw"></fa>
         </router-link>
       </li>
       <!-- Contacts -->
@@ -60,7 +60,7 @@
           :to="{ name: 'contacts' }"
           class="block text-center py-3 px-1"
         >
-          <fa icon="users" class="fa-fw" />
+          <fa icon="users" class="fa-fw"></fa>
         </router-link>
       </li>
       <!-- Profile -->
@@ -76,7 +76,7 @@
           :to="{ name: 'account' }"
           class="block text-center py-3 px-1"
         >
-          <fa icon="circle-user" class="fa-fw" />
+          <fa icon="circle-user" class="fa-fw"></fa>
         </router-link>
       </li>
     </ul>

src/components/World/components/objects/landmarks.js

@@ -1,11 +1,12 @@
 import axios from "axios";
+import * as R from "ramda";
 import * as THREE from "three";
 import { GLTFLoader } from "three/addons/loaders/GLTFLoader";
 import * as SkeletonUtils from "three/addons/utils/SkeletonUtils";
 import * as TWEEN from "@tweenjs/tween.js";
-import { db } from "@/db";
+import { accountsDB, db } from "@/db";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import { getHeaders } from "@/libs/endorserServer";
+import { accessToken } from "@/libs/crypto";
 
 const ANIMATION_DURATION_SECS = 10;
 const ENDORSER_ENTITY_PREFIX = "https://endorser.ch/entity/";
@@ -18,7 +19,17 @@ export async function loadLandmarks(vue, world, scene, loop) {
     const settings = await db.settings.get(MASTER_SETTINGS_KEY);
     const activeDid = settings?.activeDid || "";
     const apiServer = settings?.apiServer;
-    const headers = await getHeaders(activeDid);
+    await accountsDB.open();
+    const accounts = await accountsDB.accounts.toArray();
+    const account = R.find((acc) => acc.did === activeDid, accounts);
+    const headers = {
+      "Content-Type": "application/json",
+    };
+    const identity = JSON.parse(account?.identity || "null");
+    if (identity) {
+      const token = await accessToken(identity);
+      headers["Authorization"] = "Bearer " + token;
+    }
 
     const url = apiServer + "/api/v2/report/claims?claimType=GiveAction";
     const resp = await axios.get(url, { headers: headers });

src/constants/app.ts

@@ -4,10 +4,6 @@
  * See also ../libs/veramo/setup.ts
  */
 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",
-
   PROD_ENDORSER_API_SERVER = "https://api.endorser.ch",
   TEST_ENDORSER_API_SERVER = "https://test-api.endorser.ch",
   LOCAL_ENDORSER_API_SERVER = "http://localhost:3000",
@@ -34,11 +30,6 @@ export const DEFAULT_IMAGE_API_SERVER =
 export const DEFAULT_PUSH_SERVER =
   window.location.protocol + "//" + window.location.host;
 
-export const IMAGE_TYPE_PROFILE = "profile";
-
-export const PASSKEYS_ENABLED =
-  !!import.meta.env.VITE_PASSKEYS_ENABLED || false;
-
 /**
  * The possible values for "group" and "type" are in App.vue.
  * From the notiwind package
@@ -47,11 +38,6 @@ export interface NotificationIface {
   group: string; // "alert" | "modal"
   type: string; // "toast" | "info" | "success" | "warning" | "danger"
   title: string;
-  text?: string;
-  noText?: string;
-  onCancel?: (stopAsking: boolean) => Promise<void>;
-  onNo?: (stopAsking: boolean) => Promise<void>;
+  text: string;
   onYes?: () => Promise<void>;
-  promptToStopAsking?: boolean;
-  yesText?: string;
 }

src/db/index.ts

@@ -8,7 +8,6 @@ import {
   Settings,
   SettingsSchema,
 } from "./tables/settings";
-import { Temp, TempSchema } from "./tables/temp";
 import { DEFAULT_ENDORSER_API_SERVER } from "@/constants/app";
 
 // Define types for tables that hold sensitive and non-sensitive data
@@ -17,7 +16,6 @@ type NonsensitiveTables = {
   contacts: Table<Contact>;
   logs: Table<Log>;
   settings: Table<Settings>;
-  temp: Table<Temp>;
 };
 
 // Using 'unknown' instead of 'any' for stricter typing and to avoid TypeScript warnings
@@ -27,7 +25,14 @@ export type NonsensitiveDexie<T extends unknown = NonsensitiveTables> =
 
 // Initialize Dexie databases for sensitive and non-sensitive data
 export const accountsDB = new BaseDexie("TimeSafariAccounts") as SensitiveDexie;
+const SensitiveSchemas = { ...AccountsSchema };
+
 export const db = new BaseDexie("TimeSafari") as NonsensitiveDexie;
+const NonsensitiveSchemas = {
+  ...ContactSchema,
+  ...LogSchema,
+  ...SettingsSchema,
+};
 
 // Manage the encryption key. If not present in localStorage, create and store it.
 const secret =
@@ -37,22 +42,15 @@ if (!localStorage.getItem("secret")) localStorage.setItem("secret", secret);
 // Apply encryption to the sensitive database using the secret key
 encrypted(accountsDB, { secretKey: secret });
 
-// Define the schemas for our databases
-// Only the tables with index modifications need listing. https://dexie.org/docs/Tutorial/Design#database-versioning
-accountsDB.version(1).stores(AccountsSchema);
-// v1 also had contacts & settings
-// v2 added Log
-db.version(2).stores({
-  ...ContactSchema,
-  ...LogSchema,
-  ...SettingsSchema,
-});
-// v3 added Temp
-db.version(3).stores(TempSchema);
+// Define the schema for our databases
+accountsDB.version(1).stores(SensitiveSchemas);
+// v1 was contacts & settings
+// v2 added logs
+db.version(2).stores(NonsensitiveSchemas);
 
 // Event handler to initialize the non-sensitive database with default settings
-db.on("populate", async () => {
-  await db.settings.add({
+db.on("populate", () => {
+  db.settings.add({
     id: MASTER_SETTINGS_KEY,
     apiServer: DEFAULT_ENDORSER_API_SERVER,
   });

src/db/tables/accounts.ts

@@ -3,46 +3,41 @@
  */
 export type Account = {
   /**
-   * Auto-generated ID by Dexie
+   * Auto-generated ID by Dexie.
    */
   id?: number;
 
   /**
-   * The date the account was created
+   * The date the account was created.
    */
   dateCreated: string;
 
   /**
-   * The derivation path for the account, if this is from a mnemonic
+   * The derivation path for the account.
    */
-  derivationPath?: string;
+  derivationPath: string;
 
   /**
-   * Decentralized Identifier (DID) for the account
+   * Decentralized Identifier (DID) for the account.
    */
   did: string;
 
   /**
-   * Stringified JSON containing underlying key material, if generated from a mnemonic
-   * Based on the IIdentifier type from Veramo
+   * Stringified JSON containing underlying key material.
+   * Based on the IIdentifier type from Veramo.
    * @see {@link https://github.com/uport-project/veramo/blob/next/packages/core-types/src/types/IIdentifier.ts}
    */
-  identity?: string;
+  identity: string;
 
   /**
-   * The mnemonic phrase for the account, if this is from a mnemonic
-   */
-  mnemonic?: string;
-
-  /**
-   * The Webauthn credential ID in hex, if this is from a passkey
-   */
-  passkeyCredIdHex?: string;
-
-  /**
-   * The public key in hexadecimal format
+   * The public key in hexadecimal format.
    */
   publicKeyHex: string;
+
+  /**
+   * The mnemonic passphrase for the account.
+   */
+  mnemonic: string;
 };
 
 /**

src/db/tables/contacts.ts

@@ -2,7 +2,6 @@ export interface Contact {
   did: string;
   name?: string;
   nextPubKeyHashB64?: string; // base64-encoded SHA256 hash of next public key
-  profileImageUrl?: string;
   publicKeyBase64?: string;
   seesMe?: boolean;
   registered?: boolean;

src/db/tables/settings.ts

@@ -20,14 +20,11 @@ export type Settings = {
   filterFeedByNearby?: boolean; // filter by nearby
   filterFeedByVisible?: boolean; // filter by visible users ie. anyone not hidden
 
-  firstName?: string; // user's full name
-  hideRegisterPromptOnNewContact?: boolean;
+  firstName?: string; // User's first name
   isRegistered?: boolean;
   lastName?: string; // deprecated - put all names in firstName
-  lastNotifiedClaimId?: string;
-  lastViewedClaimId?: string;
-  passkeyExpirationMinutes?: number; // passkey access token time-to-live in minutes
-  profileImageUrl?: string;
+  lastNotifiedClaimId?: string; // Last notified claim ID
+  lastViewedClaimId?: string; // Last viewed claim ID
   reminderTime?: number; // Time in milliseconds since UNIX epoch for reminders
   reminderOn?: boolean; // Toggle to enable or disable reminders
 
@@ -38,8 +35,7 @@ export type Settings = {
   }>;
 
   showContactGivesInline?: boolean; // Display contact inline or not
-  showGeneralAdvanced?: boolean; // Show advanced features which don't have their own flag
-  showShortcutBvc?: boolean; // Show shortcut for Bountiful Voluntaryist Community actions
+  showShortcutBvc?: boolean; // Show shortcut for BVC actions
   vapid?: string; // VAPID (Voluntary Application Server Identification) field for web push
   warnIfProdServer?: boolean; // Warn if using a production server
   warnIfTestServer?: boolean; // Warn if using a testing server
@@ -47,7 +43,7 @@ export type Settings = {
 };
 
 export function isAnyFeedFilterOn(settings: Settings): boolean {
-  return !!(settings?.filterFeedByNearby || settings?.filterFeedByVisible);
+  return !!(settings.filterFeedByNearby || settings.filterFeedByVisible);
 }
 
 /**
@@ -61,5 +57,3 @@ export const SettingsSchema = {
  * Constants.
  */
 export const MASTER_SETTINGS_KEY = 1;
-
-export const DEFAULT_PASSKEY_EXPIRATION_MINUTES = 15;

src/db/tables/temp.ts

@@ -1,14 +0,0 @@
-// for ephemeral uses, eg. passing a blob from the service worker to the main thread
-
-export type Temp = {
-  id: string;
-  blob?: Blob; // deprecated because webkit (Safari) does not support Blob
-  blobB64?: string; // base64-encoded blob
-};
-
-/**
- * Schema for the Temp table in the database.
- */
-export const TempSchema = {
-  temp: "id",
-};

src/libs/crypto/index.ts

@@ -3,18 +3,14 @@ import { getRandomBytesSync } from "ethereum-cryptography/random";
 import { entropyToMnemonic } from "ethereum-cryptography/bip39";
 import { wordlist } from "ethereum-cryptography/bip39/wordlists/english";
 import { HDNode } from "@ethersproject/hdnode";
+import * as didJwt from "did-jwt";
+import * as u8a from "uint8arrays";
 
-import {
-  createEndorserJwtForDid,
-  ENDORSER_JWT_URL_LOCATION,
-} from "@/libs/endorserServer";
+import { ENDORSER_JWT_URL_LOCATION } from "@/libs/endorserServer";
 import { DEFAULT_DID_PROVIDER_NAME } from "../veramo/setup";
-import { decodeEndorserJwt } from "@/libs/crypto/vc";
 
 export const DEFAULT_ROOT_DERIVATION_PATH = "m/84737769'/0'/0'/0'";
 
-export const LOCAL_KMS_NAME = "local";
-
 /**
  *
  *
@@ -35,7 +31,7 @@ export const newIdentifier = (
     keys: [
       {
         kid: publicHex,
-        kms: LOCAL_KMS_NAME,
+        kms: "local",
         meta: { derivationPath: derivationPath },
         privateKeyHex: privateHex,
         publicKeyHex: publicHex,
@@ -68,10 +64,6 @@ export const deriveAddress = (
   return [address, privateHex, publicHex, derivationPath];
 };
 
-export const generateRandomBytes = (numBytes: number): Uint8Array => {
-  return getRandomBytesSync(numBytes);
-};
-
 /**
  *
  *
@@ -85,21 +77,82 @@ export const generateSeed = (): string => {
 };
 
 /**
- * Retrieve an access token, or "" if no DID is provided.
+ * Retreive an access token
  *
+ * @param {IIdentifier} identifier
  * @return {*}
  */
-export const accessToken = async (did?: string) => {
-  if (did) {
-    const nowEpoch = Math.floor(Date.now() / 1000);
-    const endEpoch = nowEpoch + 60; // add one minute
-    const tokenPayload = { exp: endEpoch, iat: nowEpoch, iss: did };
-    return createEndorserJwtForDid(did, tokenPayload);
-  } else {
-    return "";
-  }
+export const accessToken = async (identifier: IIdentifier) => {
+  const did: string = identifier.did;
+  const privateKeyHex: string = identifier.keys[0].privateKeyHex as string;
+
+  const signer = SimpleSigner(privateKeyHex);
+
+  const nowEpoch = Math.floor(Date.now() / 1000);
+  const endEpoch = nowEpoch + 60; // add one minute
+
+  const tokenPayload = { exp: endEpoch, iat: nowEpoch, iss: did };
+  const alg = undefined; // defaults to 'ES256K', more standardized but harder to verify vs ES256K-R
+  const jwt: string = await didJwt.createJWT(tokenPayload, {
+    alg,
+    issuer: did,
+    signer,
+  });
+  return jwt;
 };
 
+export const sign = async (privateKeyHex: string) => {
+  const signer = SimpleSigner(privateKeyHex);
+
+  return signer;
+};
+
+/**
+ *  Copied out of did-jwt since it's deprecated in that library.
+ *
+ *  The SimpleSigner returns a configured function for signing data.
+ *
+ *  @example
+ *  const signer = SimpleSigner(import.meta.env.PRIVATE_KEY)
+ *  signer(data, (err, signature) => {
+ *    ...
+ *  })
+ *
+ *  @param    {String}         hexPrivateKey    a hex encoded private key
+ *  @return   {Function}                     a configured signer function
+ */
+export function SimpleSigner(hexPrivateKey: string): didJwt.Signer {
+  const signer = didJwt.ES256KSigner(didJwt.hexToBytes(hexPrivateKey), true);
+  return async (data) => {
+    const signature = (await signer(data)) as string;
+    return fromJose(signature);
+  };
+}
+
+// from did-jwt/util; see SimpleSigner above
+export function fromJose(signature: string): {
+  r: string;
+  s: string;
+  recoveryParam?: number;
+} {
+  const signatureBytes: Uint8Array = didJwt.base64ToBytes(signature);
+  if (signatureBytes.length < 64 || signatureBytes.length > 65) {
+    throw new TypeError(
+      `Wrong size for signature. Expected 64 or 65 bytes, but got ${signatureBytes.length}`,
+    );
+  }
+  const r = bytesToHex(signatureBytes.slice(0, 32));
+  const s = bytesToHex(signatureBytes.slice(32, 64));
+  const recoveryParam =
+    signatureBytes.length === 65 ? signatureBytes[64] : undefined;
+  return { r, s, recoveryParam };
+}
+
+// from did-jwt/util; see SimpleSigner above
+export function bytesToHex(b: Uint8Array): string {
+  return u8a.toString(b, "base16");
+}
+
 /**
  @return results of uportJwtPayload:
  { iat: number, iss: string (DID), own: { name, publicEncKey (base64-encoded key) } }
@@ -116,7 +169,7 @@ export const getContactPayloadFromJwtUrl = (jwtUrlText: string) => {
   }
 
   // JWT format: { header, payload, signature, data }
-  const jwt = decodeEndorserJwt(jwtText);
+  const jwt = didJwt.decodeJWT(jwtText);
 
   return jwt.payload;
 };

src/libs/crypto/vc/didPeer.ts

@@ -1,96 +0,0 @@
-import { Buffer } from "buffer/";
-import { decode as cborDecode } from "cbor-x";
-import { bytesToMultibase, multibaseToBytes } from "did-jwt";
-
-import { getWebCrypto } from "@/libs/crypto/vc/passkeyHelpers";
-
-export const PEER_DID_PREFIX = "did:peer:";
-const PEER_DID_MULTIBASE_PREFIX = PEER_DID_PREFIX + "0";
-
-/**
- *
- *
- * similar code is in crowd-funder-for-time-pwa libs/crypto/vc/passkeyDidPeer.ts verifyJwtWebCrypto
- *
- * @returns {Promise<boolean>}
- */
-export async function verifyPeerSignature(
-  payloadBytes: Buffer,
-  issuerDid: string,
-  signatureBytes: Uint8Array,
-): Promise<boolean> {
-  const publicKeyBytes = peerDidToPublicKeyBytes(issuerDid);
-
-  const WebCrypto = await getWebCrypto();
-  const verifyAlgorithm = {
-    name: "ECDSA",
-    hash: { name: "SHA-256" },
-  };
-  const publicKeyJwk = cborToKeys(publicKeyBytes).publicKeyJwk;
-  const keyAlgorithm = {
-    name: "ECDSA",
-    namedCurve: publicKeyJwk.crv,
-  };
-  const publicKeyCryptoKey = await WebCrypto.subtle.importKey(
-    "jwk",
-    publicKeyJwk,
-    keyAlgorithm,
-    false,
-    ["verify"],
-  );
-  const verified = await WebCrypto.subtle.verify(
-    verifyAlgorithm,
-    publicKeyCryptoKey,
-    signatureBytes,
-    payloadBytes,
-  );
-  return verified;
-}
-
-export function cborToKeys(publicKeyBytes: Uint8Array) {
-  const jwkObj = cborDecode(publicKeyBytes);
-  if (
-    jwkObj[1] != 2 || // kty "EC"
-    jwkObj[3] != -7 || // alg "ES256"
-    jwkObj[-1] != 1 || // crv "P-256"
-    jwkObj[-2].length != 32 || // x
-    jwkObj[-3].length != 32 // y
-  ) {
-    throw new Error("Unable to extract key.");
-  }
-  const publicKeyJwk = {
-    alg: "ES256",
-    crv: "P-256",
-    kty: "EC",
-    x: arrayToBase64Url(jwkObj[-2]),
-    y: arrayToBase64Url(jwkObj[-3]),
-  };
-  const publicKeyBuffer = Buffer.concat([
-    Buffer.from(jwkObj[-2]),
-    Buffer.from(jwkObj[-3]),
-  ]);
-  return { publicKeyJwk, publicKeyBuffer };
-}
-
-export function toBase64Url(anythingB64: string) {
-  return anythingB64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
-}
-
-export function arrayToBase64Url(anything: Uint8Array) {
-  return toBase64Url(Buffer.from(anything).toString("base64"));
-}
-
-export function peerDidToPublicKeyBytes(did: string) {
-  return multibaseToBytes(did.substring(PEER_DID_MULTIBASE_PREFIX.length));
-}
-
-export function createPeerDid(publicKeyBytes: Uint8Array) {
-  // https://github.com/decentralized-identity/veramo/blob/next/packages/did-provider-peer/src/peer-did-provider.ts#L67
-  //const provider = new PeerDIDProvider({ defaultKms: LOCAL_KMS_NAME });
-  const methodSpecificId = bytesToMultibase(
-    publicKeyBytes,
-    "base58btc",
-    "p256-pub",
-  );
-  return PEER_DID_MULTIBASE_PREFIX + methodSpecificId;
-}

src/libs/crypto/vc/index.ts

@@ -1,112 +0,0 @@
-/**
- * Verifiable Credential & DID functions, specifically for EndorserSearch.org tools
- *
- * The goal is to make this folder similar across projects, then move it to a library.
- * Other projects: endorser-ch, image-api
- *
- */
-
-import * as didJwt from "did-jwt";
-import { JWTDecoded } from "did-jwt/lib/JWT";
-import { IIdentifier } from "@veramo/core";
-import * as u8a from "uint8arrays";
-
-import { createDidPeerJwt } from "@/libs/crypto/vc/passkeyDidPeer";
-
-export const ETHR_DID_PREFIX = "did:ethr:";
-
-/**
- * Meta info about a key
- */
-export interface KeyMeta {
-  /**
-   * Decentralized ID for the key
-   */
-  did: string;
-  /**
-   * Stringified IIDentifier object from Veramo
-   */
-  identity?: string;
-  /**
-   * The Webauthn credential ID in hex, if this is from a passkey
-   */
-  passkeyCredIdHex?: string;
-}
-
-/**
- * Tell whether a key is from a passkey
- * @param keyMeta contains info about the key, whose passkeyCredIdHex determines if the key is from a passkey
- */
-export function isFromPasskey(keyMeta?: KeyMeta): boolean {
-  return !!keyMeta?.passkeyCredIdHex;
-}
-
-export async function createEndorserJwtForKey(
-  account: KeyMeta,
-  payload: object,
-) {
-  if (account?.identity) {
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    const identity: IIdentifier = JSON.parse(account.identity!);
-    const privateKeyHex = identity.keys[0].privateKeyHex;
-    const signer = await SimpleSigner(privateKeyHex as string);
-    return didJwt.createJWT(payload, {
-      issuer: account.did,
-      signer: signer,
-    });
-  } else if (account?.passkeyCredIdHex) {
-    return createDidPeerJwt(account.did, account.passkeyCredIdHex, payload);
-  } else {
-    throw new Error("No identity data found to sign for DID " + account.did);
-  }
-}
-
-/**
- *  Copied out of did-jwt since it's deprecated in that library.
- *
- *  The SimpleSigner returns a configured function for signing data.
- *
- *  @example
- *  const signer = SimpleSigner(privateKeyHexString)
- *  signer(data, (err, signature) => {
- *    ...
- *  })
- *
- *  @param    {String}         hexPrivateKey    a hex encoded private key
- *  @return   {Function}                     a configured signer function
- */
-function SimpleSigner(hexPrivateKey: string): didJwt.Signer {
-  const signer = didJwt.ES256KSigner(didJwt.hexToBytes(hexPrivateKey), true);
-  return async (data) => {
-    const signature = (await signer(data)) as string;
-    return fromJose(signature);
-  };
-}
-
-// from did-jwt/util; see SimpleSigner above
-function fromJose(signature: string): {
-  r: string;
-  s: string;
-  recoveryParam?: number;
-} {
-  const signatureBytes: Uint8Array = didJwt.base64ToBytes(signature);
-  if (signatureBytes.length < 64 || signatureBytes.length > 65) {
-    throw new TypeError(
-      `Wrong size for signature. Expected 64 or 65 bytes, but got ${signatureBytes.length}`,
-    );
-  }
-  const r = bytesToHex(signatureBytes.slice(0, 32));
-  const s = bytesToHex(signatureBytes.slice(32, 64));
-  const recoveryParam =
-    signatureBytes.length === 65 ? signatureBytes[64] : undefined;
-  return { r, s, recoveryParam };
-}
-
-// from did-jwt/util; see SimpleSigner above
-function bytesToHex(b: Uint8Array): string {
-  return u8a.toString(b, "base16");
-}
-
-export function decodeEndorserJwt(jwt: string): JWTDecoded {
-  return didJwt.decodeJWT(jwt);
-}

src/libs/crypto/vc/passkeyDidPeer.ts

@@ -1,539 +0,0 @@
-import { Buffer } from "buffer/";
-import { JWTPayload } from "did-jwt";
-import { DIDResolutionResult } from "did-resolver";
-import { sha256 } from "ethereum-cryptography/sha256.js";
-import {
-  startAuthentication,
-  startRegistration,
-} from "@simplewebauthn/browser";
-import {
-  generateAuthenticationOptions,
-  generateRegistrationOptions,
-  verifyAuthenticationResponse,
-  verifyRegistrationResponse,
-} from "@simplewebauthn/server";
-import { VerifyAuthenticationResponseOpts } from "@simplewebauthn/server/esm/authentication/verifyAuthenticationResponse";
-import {
-  Base64URLString,
-  PublicKeyCredentialCreationOptionsJSON,
-  PublicKeyCredentialRequestOptionsJSON,
-} from "@simplewebauthn/types";
-
-import { AppString } from "@/constants/app";
-import { unwrapEC2Signature } from "@/libs/crypto/vc/passkeyHelpers";
-import {
-  arrayToBase64Url,
-  cborToKeys,
-  peerDidToPublicKeyBytes,
-  verifyPeerSignature,
-} from "@/libs/crypto/vc/didPeer";
-
-export interface JWK {
-  kty: string;
-  crv: string;
-  x: string;
-  y: string;
-}
-
-export async function registerCredential(passkeyName?: string) {
-  const options: PublicKeyCredentialCreationOptionsJSON =
-    await generateRegistrationOptions({
-      rpName: AppString.APP_NAME,
-      rpID: window.location.hostname,
-      userName: passkeyName || AppString.APP_NAME + " User",
-      // Don't prompt users for additional information about the authenticator
-      // (Recommended for smoother UX)
-      attestationType: "none",
-      authenticatorSelection: {
-        // Defaults
-        residentKey: "preferred",
-        userVerification: "preferred",
-        // Optional
-        authenticatorAttachment: "platform",
-      },
-    });
-  // someday, instead of simplwebauthn, we'll go direct: navigator.credentials.create with PublicKeyCredentialCreationOptions
-  // with pubKeyCredParams: { type: "public-key", alg: -7 }
-  const attResp = await startRegistration(options);
-  const verification = await verifyRegistrationResponse({
-    response: attResp,
-    expectedChallenge: options.challenge,
-    expectedOrigin: window.location.origin,
-    expectedRPID: window.location.hostname,
-  });
-
-  // references for parsing auth data and getting the public key
-  // https://github.com/MasterKale/SimpleWebAuthn/blob/master/packages/server/src/helpers/parseAuthenticatorData.ts#L11
-  // https://chatgpt.com/share/78a5c91d-099d-46dc-aa6d-fc0c916509fa
-  // https://chatgpt.com/share/3c13f061-6031-45bc-a2d7-3347c1e7a2d7
-
-  const credIdBase64Url = verification.registrationInfo?.credentialID as string;
-  if (attResp.rawId !== credIdBase64Url) {
-    console.log("Warning! The raw ID does not match the credential ID.");
-  }
-  const credIdHex = Buffer.from(
-    base64URLStringToArrayBuffer(credIdBase64Url),
-  ).toString("hex");
-  const { publicKeyJwk } = cborToKeys(
-    verification.registrationInfo?.credentialPublicKey as Uint8Array,
-  );
-
-  return {
-    authData: verification.registrationInfo?.attestationObject,
-    credIdHex: credIdHex,
-    publicKeyJwk: publicKeyJwk,
-    publicKeyBytes: verification.registrationInfo
-      ?.credentialPublicKey as Uint8Array,
-  };
-}
-
-export class PeerSetup {
-  public authenticatorData?: ArrayBuffer;
-  public challenge?: Uint8Array;
-  public clientDataJsonBase64Url?: Base64URLString;
-  public signature?: Base64URLString;
-
-  public async createJwtSimplewebauthn(
-    issuerDid: string,
-    payload: object,
-    credIdHex: string,
-    expMinutes: number = 1,
-  ) {
-    const credentialId = arrayBufferToBase64URLString(
-      Buffer.from(credIdHex, "hex").buffer,
-    );
-    const issuedAt = Math.floor(Date.now() / 1000);
-    const expiryTime = Math.floor(Date.now() / 1000) + expMinutes * 60; // some minutes from now
-    const fullPayload = {
-      ...payload,
-      exp: expiryTime,
-      iat: issuedAt,
-      iss: issuerDid,
-    };
-    this.challenge = new Uint8Array(Buffer.from(JSON.stringify(fullPayload)));
-    // const payloadHash: Uint8Array = sha256(this.challenge);
-    const options: PublicKeyCredentialRequestOptionsJSON =
-      await generateAuthenticationOptions({
-        challenge: this.challenge,
-        rpID: window.location.hostname,
-        allowCredentials: [{ id: credentialId }],
-      });
-    // console.log("simple authentication options", options);
-
-    const clientAuth = await startAuthentication(options);
-    // console.log("simple credential get", clientAuth);
-
-    const authenticatorDataBase64Url = clientAuth.response.authenticatorData;
-    this.authenticatorData = Buffer.from(
-      clientAuth.response.authenticatorData,
-      "base64",
-    ).buffer;
-    this.clientDataJsonBase64Url = clientAuth.response.clientDataJSON;
-    // console.log("simple authenticatorData for signing", this.authenticatorData);
-    this.signature = clientAuth.response.signature;
-
-    // Our custom type of JWANT means the signature is based on a concatenation of the two Webauthn properties
-    const header: JWTPayload = { typ: "JWANT", alg: "ES256" };
-    const headerBase64 = Buffer.from(JSON.stringify(header))
-      .toString("base64")
-      .replace(/\+/g, "-")
-      .replace(/\//g, "_")
-      .replace(/=+$/, "");
-
-    const dataInJwt = {
-      AuthenticationDataB64URL: authenticatorDataBase64Url,
-      ClientDataJSONB64URL: this.clientDataJsonBase64Url,
-      exp: expiryTime,
-      iat: issuedAt,
-      iss: issuerDid,
-    };
-    const dataInJwtString = JSON.stringify(dataInJwt);
-    const payloadBase64 = Buffer.from(dataInJwtString)
-      .toString("base64")
-      .replace(/\+/g, "-")
-      .replace(/\//g, "_")
-      .replace(/=+$/, "");
-
-    const signature = clientAuth.response.signature;
-
-    return headerBase64 + "." + payloadBase64 + "." + signature;
-  }
-
-  public async createJwtNavigator(
-    issuerDid: string,
-    payload: object,
-    credIdHex: string,
-    expMinutes: number = 1,
-  ) {
-    const issuedAt = Math.floor(Date.now() / 1000);
-    const expiryTime = Math.floor(Date.now() / 1000) + expMinutes * 60; // some minutes from now
-    const fullPayload = {
-      ...payload,
-      exp: expiryTime,
-      iat: issuedAt,
-      iss: issuerDid,
-    };
-    const dataToSignString = JSON.stringify(fullPayload);
-    const dataToSignBuffer = Buffer.from(dataToSignString);
-    const credentialId = Buffer.from(credIdHex, "hex");
-
-    // console.log("lower credentialId", credentialId);
-    this.challenge = new Uint8Array(dataToSignBuffer);
-    const options = {
-      publicKey: {
-        allowCredentials: [
-          {
-            id: credentialId,
-            type: "public-key" as const,
-          },
-        ],
-        challenge: this.challenge.buffer,
-        rpID: window.location.hostname,
-        userVerification: "preferred" as const,
-      },
-    };
-
-    const credential = await navigator.credentials.get(options);
-    // console.log("nav credential get", credential);
-
-    this.authenticatorData = credential?.response.authenticatorData;
-    const authenticatorDataBase64Url = arrayBufferToBase64URLString(
-      this.authenticatorData as ArrayBuffer,
-    );
-
-    this.clientDataJsonBase64Url = arrayBufferToBase64URLString(
-      credential?.response.clientDataJSON,
-    );
-
-    // Our custom type of JWANT means the signature is based on a concatenation of the two Webauthn properties
-    const header: JWTPayload = { typ: "JWANT", alg: "ES256" };
-    const headerBase64 = Buffer.from(JSON.stringify(header))
-      .toString("base64")
-      .replace(/\+/g, "-")
-      .replace(/\//g, "_")
-      .replace(/=+$/, "");
-
-    const dataInJwt = {
-      AuthenticationDataB64URL: authenticatorDataBase64Url,
-      ClientDataJSONB64URL: this.clientDataJsonBase64Url,
-      exp: expiryTime,
-      iat: issuedAt,
-      iss: issuerDid,
-    };
-    const dataInJwtString = JSON.stringify(dataInJwt);
-    const payloadBase64 = Buffer.from(dataInJwtString)
-      .toString("base64")
-      .replace(/\+/g, "-")
-      .replace(/\//g, "_")
-      .replace(/=+$/, "");
-
-    const origSignature = Buffer.from(credential?.response.signature).toString(
-      "base64",
-    );
-    this.signature = origSignature
-      .replace(/\+/g, "-")
-      .replace(/\//g, "_")
-      .replace(/=+$/, "");
-
-    const jwt = headerBase64 + "." + payloadBase64 + "." + this.signature;
-    return jwt;
-  }
-
-  // To use this, add the asn1-ber library and add this import:
-  // import asn1 from "asn1-ber";
-  //
-  // return a low-level signing function, similar to createJWS approach
-  // async webAuthnES256KSigner(credentialID: string) {
-  //   return async (data: string | Uint8Array) => {
-  //     // get signature from WebAuthn
-  //     const signature = await this.generateWebAuthnSignature(data);
-  //
-  //     // This converts from the browser ArrayBuffer to a Node.js Buffer, which is a requirement for the asn1 library.
-  //     const signatureBuffer = Buffer.from(signature);
-  //     console.log("lower signature inside signer", signature);
-  //     console.log("lower buffer signature inside signer", signatureBuffer);
-  //     console.log("lower base64 buffer signature inside signer", signatureBuffer.toString("base64"));
-  //     // Decode the DER-encoded signature to extract R and S values
-  //     const reader = new asn1.BerReader(signatureBuffer);
-  //     console.log("lower after reader");
-  //     reader.readSequence();
-  //     console.log("lower after read sequence");
-  //     const r = reader.readString(asn1.Ber.Integer, true);
-  //     console.log("lower after r");
-  //     const s = reader.readString(asn1.Ber.Integer, true);
-  //     console.log("lower after r & s");
-  //
-  //     // Ensure R and S are 32 bytes each
-  //     const rBuffer = Buffer.from(r);
-  //     const sBuffer = Buffer.from(s);
-  //     console.log("lower after rBuffer & sBuffer", rBuffer, sBuffer);
-  //     const rWithoutPrefix = rBuffer.length > 32 ? rBuffer.slice(1) : rBuffer;
-  //     const sWithoutPrefix = sBuffer.length > 32 ? sBuffer.slice(1) : sBuffer;
-  //     const rPadded =
-  //       rWithoutPrefix.length < 32
-  //         ? Buffer.concat([Buffer.alloc(32 - rWithoutPrefix.length), rBuffer])
-  //         : rWithoutPrefix;
-  //     const sPadded =
-  //       rWithoutPrefix.length < 32
-  //         ? Buffer.concat([Buffer.alloc(32 - sWithoutPrefix.length), sBuffer])
-  //         : sWithoutPrefix;
-  //
-  //     // Concatenate R and S to form the 64-byte array (ECDSA signature format expected by JWT)
-  //     const combinedSignature = Buffer.concat([rPadded, sPadded]);
-  //     console.log(
-  //       "lower combinedSignature",
-  //       combinedSignature.length,
-  //       combinedSignature,
-  //     );
-  //
-  //     const combSig64 = combinedSignature.toString("base64");
-  //     console.log("lower combSig64", combSig64);
-  //     const combSig64Url = combSig64
-  //       .replace(/\+/g, "-")
-  //       .replace(/\//g, "_")
-  //       .replace(/=+$/, "");
-  //     console.log("lower combSig64Url", combSig64Url);
-  //     return combSig64Url;
-  //   };
-  // }
-}
-
-export async function createDidPeerJwt(
-  did: string,
-  credIdHex: string,
-  payload: object,
-): Promise<string> {
-  const peerSetup = new PeerSetup();
-  const jwt = await peerSetup.createJwtNavigator(did, payload, credIdHex);
-  return jwt;
-}
-
-// I'd love to use this but it doesn't verify.
-// Requires:
-// npm install @noble/curves
-// ... and this import:
-// import { p256 } from "@noble/curves/p256";
-export async function verifyJwtP256(
-  credIdHex: string,
-  issuerDid: string,
-  authenticatorData: ArrayBuffer,
-  challenge: Uint8Array,
-  clientDataJsonBase64Url: Base64URLString,
-  signature: Base64URLString,
-) {
-  const authDataFromBase = Buffer.from(authenticatorData);
-  const clientDataFromBase = Buffer.from(clientDataJsonBase64Url, "base64");
-  const sigBuffer = Buffer.from(signature, "base64");
-  const finalSigBuffer = unwrapEC2Signature(sigBuffer);
-  const publicKeyBytes = peerDidToPublicKeyBytes(issuerDid);
-
-  // Hash the client data
-  const hash = sha256(clientDataFromBase);
-
-  // Construct the preimage
-  const preimage = Buffer.concat([authDataFromBase, hash]);
-
-  const isValid = p256.verify(
-    finalSigBuffer,
-    new Uint8Array(preimage),
-    publicKeyBytes,
-  );
-  return isValid;
-}
-
-export async function verifyJwtSimplewebauthn(
-  credIdHex: string,
-  issuerDid: string,
-  authenticatorData: ArrayBuffer,
-  challenge: Uint8Array,
-  clientDataJsonBase64Url: Base64URLString,
-  signature: Base64URLString,
-) {
-  const authData = arrayToBase64Url(Buffer.from(authenticatorData));
-  const publicKeyBytes = peerDidToPublicKeyBytes(issuerDid);
-  const credId = arrayBufferToBase64URLString(
-    Buffer.from(credIdHex, "hex").buffer,
-  );
-  const authOpts: VerifyAuthenticationResponseOpts = {
-    authenticator: {
-      credentialID: credId,
-      credentialPublicKey: publicKeyBytes,
-      counter: 0,
-    },
-    expectedChallenge: arrayToBase64Url(challenge),
-    expectedOrigin: window.location.origin,
-    expectedRPID: window.location.hostname,
-    response: {
-      authenticatorAttachment: "platform",
-      clientExtensionResults: {},
-      id: credId,
-      rawId: credId,
-      response: {
-        authenticatorData: authData,
-        clientDataJSON: clientDataJsonBase64Url,
-        signature: signature,
-      },
-      type: "public-key",
-    },
-  };
-  const verification = await verifyAuthenticationResponse(authOpts);
-  return verification.verified;
-}
-
-// similar code is in endorser-ch util-crypto.ts verifyPeerSignature
-export async function verifyJwtWebCrypto(
-  credId: Base64URLString,
-  issuerDid: string,
-  authenticatorData: ArrayBuffer,
-  challenge: Uint8Array,
-  clientDataJsonBase64Url: Base64URLString,
-  signature: Base64URLString,
-) {
-  const authDataFromBase = Buffer.from(authenticatorData);
-  const clientDataFromBase = Buffer.from(clientDataJsonBase64Url, "base64");
-  const sigBuffer = Buffer.from(signature, "base64");
-  const finalSigBuffer = unwrapEC2Signature(sigBuffer);
-
-  // Hash the client data
-  const hash = sha256(clientDataFromBase);
-
-  // Construct the preimage
-  const preimage = Buffer.concat([authDataFromBase, hash]);
-  return verifyPeerSignature(preimage, issuerDid, finalSigBuffer);
-}
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-async function peerDidToDidDocument(did: string): Promise<DIDResolutionResult> {
-  if (!did.startsWith("did:peer:0z")) {
-    throw new Error(
-      "This only verifies a peer DID, method 0, encoded base58btc.",
-    );
-  }
-  // this is basically hard-coded from https://www.w3.org/TR/did-core/#example-various-verification-method-types
-  // (another reference is the @aviarytech/did-peer resolver)
-
-  /**
-   * Looks like JsonWebKey2020 isn't too difficult:
-   * - change context security/suites link to jws-2020/v1
-   * - change publicKeyMultibase to publicKeyJwk generated with cborToKeys
-   * - change type to JsonWebKey2020
-   */
-
-  const id = did.split(":")[2];
-  const multibase = id.slice(1);
-  const encnumbasis = multibase.slice(1);
-  const didDocument = {
-    "@context": [
-      "https://www.w3.org/ns/did/v1",
-      "https://w3id.org/security/suites/secp256k1-2019/v1",
-    ],
-    assertionMethod: [did + "#" + encnumbasis],
-    authentication: [did + "#" + encnumbasis],
-    capabilityDelegation: [did + "#" + encnumbasis],
-    capabilityInvocation: [did + "#" + encnumbasis],
-    id: did,
-    keyAgreement: undefined,
-    service: undefined,
-    verificationMethod: [
-      {
-        controller: did,
-        id: did + "#" + encnumbasis,
-        publicKeyMultibase: multibase,
-        type: "EcdsaSecp256k1VerificationKey2019",
-      },
-    ],
-  };
-  return {
-    didDocument,
-    didDocumentMetadata: {},
-    didResolutionMetadata: { contentType: "application/did+ld+json" },
-  };
-}
-
-// convert COSE public key to PEM format
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function COSEtoPEM(cose: Buffer) {
-  // const alg = cose.get(3); // Algorithm
-  const x = cose[-2]; // x-coordinate
-  const y = cose[-3]; // y-coordinate
-
-  // Ensure the coordinates are in the correct format
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-expect-error because it complains about the type of x and y
-  const pubKeyBuffer = Buffer.concat([Buffer.from([0x04]), x, y]);
-
-  // Convert to PEM format
-  const pem = `-----BEGIN PUBLIC KEY-----
-${pubKeyBuffer.toString("base64")}
------END PUBLIC KEY-----`;
-
-  return pem;
-}
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function base64urlDecode(input: string) {
-  input = input.replace(/-/g, "+").replace(/_/g, "/");
-  const pad = input.length % 4 === 0 ? "" : "====".slice(input.length % 4);
-  const str = atob(input + pad);
-  const bytes = new Uint8Array(str.length);
-  for (let i = 0; i < str.length; i++) {
-    bytes[i] = str.charCodeAt(i);
-  }
-  return bytes.buffer;
-}
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function base64urlEncode(buffer: ArrayBuffer) {
-  const str = String.fromCharCode(...new Uint8Array(buffer));
-  return btoa(str).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
-}
-
-// from @simplewebauthn/browser
-function arrayBufferToBase64URLString(buffer: ArrayBuffer) {
-  const bytes = new Uint8Array(buffer);
-  let str = "";
-  for (const charCode of bytes) {
-    str += String.fromCharCode(charCode);
-  }
-  const base64String = btoa(str);
-  return base64String.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
-}
-
-// from @simplewebauthn/browser
-function base64URLStringToArrayBuffer(base64URLString: string) {
-  const base64 = base64URLString.replace(/-/g, "+").replace(/_/g, "/");
-  const padLength = (4 - (base64.length % 4)) % 4;
-  const padded = base64.padEnd(base64.length + padLength, "=");
-  const binary = atob(padded);
-  const buffer = new ArrayBuffer(binary.length);
-  const bytes = new Uint8Array(buffer);
-  for (let i = 0; i < binary.length; i++) {
-    bytes[i] = binary.charCodeAt(i);
-  }
-  return buffer;
-}
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-async function pemToCryptoKey(pem: string) {
-  const binaryDerString = atob(
-    pem
-      .split("\n")
-      .filter((x) => !x.includes("-----"))
-      .join(""),
-  );
-  const binaryDer = new Uint8Array(binaryDerString.length);
-  for (let i = 0; i < binaryDerString.length; i++) {
-    binaryDer[i] = binaryDerString.charCodeAt(i);
-  }
-  // console.log("binaryDer", binaryDer.buffer);
-  return await window.crypto.subtle.importKey(
-    "spki",
-    binaryDer.buffer,
-    {
-      name: "RSASSA-PKCS1-v1_5",
-      hash: "SHA-256",
-    },
-    true,
-    ["verify"],
-  );
-}

src/libs/crypto/vc/passkeyHelpers.ts

@@ -1,105 +0,0 @@
-// from https://github.com/MasterKale/SimpleWebAuthn/blob/master/packages/server/src/helpers/iso/isoCrypto/unwrapEC2Signature.ts
-import { AsnParser } from "@peculiar/asn1-schema";
-import { ECDSASigValue } from "@peculiar/asn1-ecc";
-
-/**
- * In WebAuthn, EC2 signatures are wrapped in ASN.1 structure so we need to peel r and s apart.
- *
- * See https://www.w3.org/TR/webauthn-2/#sctn-signature-attestation-types
- */
-export function unwrapEC2Signature(signature: Uint8Array): Uint8Array {
-  const parsedSignature = AsnParser.parse(signature, ECDSASigValue);
-  let rBytes = new Uint8Array(parsedSignature.r);
-  let sBytes = new Uint8Array(parsedSignature.s);
-
-  if (shouldRemoveLeadingZero(rBytes)) {
-    rBytes = rBytes.slice(1);
-  }
-
-  if (shouldRemoveLeadingZero(sBytes)) {
-    sBytes = sBytes.slice(1);
-  }
-
-  const finalSignature = isoUint8ArrayConcat([rBytes, sBytes]);
-
-  return finalSignature;
-}
-
-/**
- * Determine if the DER-specific `00` byte at the start of an ECDSA signature byte sequence
- * should be removed based on the following logic:
- *
- * "If the leading byte is 0x0, and the the high order bit on the second byte is not set to 0,
- * then remove the leading 0x0 byte"
- */
-function shouldRemoveLeadingZero(bytes: Uint8Array): boolean {
-  return bytes[0] === 0x0 && (bytes[1] & (1 << 7)) !== 0;
-}
-
-// from https://github.com/MasterKale/SimpleWebAuthn/blob/master/packages/server/src/helpers/iso/isoUint8Array.ts#L49
-/**
- * Combine multiple Uint8Arrays into a single Uint8Array
- */
-export function isoUint8ArrayConcat(arrays: Uint8Array[]): Uint8Array {
-  let pointer = 0;
-  const totalLength = arrays.reduce((prev, curr) => prev + curr.length, 0);
-
-  const toReturn = new Uint8Array(totalLength);
-
-  arrays.forEach((arr) => {
-    toReturn.set(arr, pointer);
-    pointer += arr.length;
-  });
-
-  return toReturn;
-}
-
-// from https://github.com/MasterKale/SimpleWebAuthn/blob/master/packages/server/src/helpers/iso/isoCrypto/getWebCrypto.ts
-let webCrypto: { subtle: SubtleCrypto } | undefined = undefined;
-export function getWebCrypto(): Promise<{ subtle: SubtleCrypto }> {
-  /**
-   * Hello there! If you came here wondering why this method is asynchronous when use of
-   * `globalThis.crypto` is not, it's to minimize a bunch of refactor related to making this
-   * synchronous. For example, `generateRegistrationOptions()` and `generateAuthenticationOptions()`
-   * become synchronous if we make this synchronous (since nothing else in that method is async)
-   * which represents a breaking API change in this library's core API.
-   *
-   * TODO: If it's after February 2025 when you read this then consider whether it still makes sense
-   * to keep this method asynchronous.
-   */
-  const toResolve: Promise<{ subtle: SubtleCrypto }> = new Promise(
-    (resolve, reject) => {
-      if (webCrypto) {
-        return resolve(webCrypto);
-      }
-      /**
-       * Naively attempt to access Crypto as a global object, which popular ESM-centric run-times
-       * support (and Node v20+)
-       */
-      const _globalThisCrypto =
-        _getWebCryptoInternals.stubThisGlobalThisCrypto();
-      if (_globalThisCrypto) {
-        webCrypto = _globalThisCrypto;
-        return resolve(webCrypto);
-      }
-      // We tried to access it both in Node and globally, so bail out
-      return reject(new MissingWebCrypto());
-    },
-  );
-  return toResolve;
-}
-class MissingWebCrypto extends Error {
-  constructor() {
-    const message = "An instance of the Crypto API could not be located";
-    super(message);
-    this.name = "MissingWebCrypto";
-  }
-}
-// Make it possible to stub return values during testing
-const _getWebCryptoInternals = {
-  stubThisGlobalThisCrypto: () => globalThis.crypto,
-  // Make it possible to reset the `webCrypto` at the top of the file
-  setCachedCrypto: (newCrypto: { subtle: SubtleCrypto }) => {
-    webCrypto = newCrypto;
-  },
-};

src/libs/endorserServer.ts

@@ -1,13 +1,11 @@
-import { Axios, AxiosRequestConfig, AxiosResponse } from "axios";
+import { Axios, AxiosResponse, RawAxiosRequestHeaders } from "axios";
+import * as didJwt from "did-jwt";
 import { LRUCache } from "lru-cache";
 import * as R from "ramda";
+import { IIdentifier } from "@veramo/core";
 
-import { DEFAULT_IMAGE_API_SERVER } from "@/constants/app";
 import { Contact } from "@/db/tables/contacts";
-import { accessToken } from "@/libs/crypto";
-import { NonsensitiveDexie } from "@/db/index";
-import { getAccount, getPasskeyExpirationSeconds } from "@/libs/util";
-import { createEndorserJwtForKey, KeyMeta } from "@/libs/crypto/vc";
+import { accessToken, SimpleSigner } from "@/libs/crypto";
 
 export const SCHEMA_ORG_CONTEXT = "https://schema.org";
 // the object in RegisterAction claims
@@ -29,14 +27,14 @@ export interface AgreeVerifiableCredential {
   object: Record<string, any>;
 }
 
-export interface GiverReceiverInputInfo {
+export interface GiverInputInfo {
   did?: string;
   name?: string;
 }
 
 export interface GiverOutputInfo {
   action: string;
-  giver?: GiverReceiverInputInfo;
+  giver?: GiverInputInfo;
   description?: string;
   amount?: number;
   unitCode?: string;
@@ -48,32 +46,28 @@ export interface ClaimResult {
 }
 
 export interface GenericVerifiableCredential {
-  "@context"?: string; // optional when embedded, eg. in an Agree
+  "@context": string;
   "@type": string;
   [key: string]: any; // eslint-disable-line @typescript-eslint/no-explicit-any
 }
 
-export interface GenericCredWrapper<T extends GenericVerifiableCredential> {
-  "@context": string;
-  "@type": string;
-  claim: T;
-  claimType?: string;
-  handleId: string;
+export interface GenericCredWrapper extends GenericVerifiableCredential {
+  handleId?: string;
   id: string;
   issuedAt: string;
   issuer: string;
-  publicUrls?: Record<string, string>; // only for IDs that want to be public
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  claim: Record<string, any>;
+  claimType?: string;
 }
-export const BLANK_GENERIC_SERVER_RECORD: GenericCredWrapper<GenericVerifiableCredential> =
-  {
-    "@context": SCHEMA_ORG_CONTEXT,
-    "@type": "",
-    claim: { "@type": "" },
-    handleId: "",
-    id: "",
-    issuedAt: "",
-    issuer: "",
-  };
+export const BLANK_GENERIC_SERVER_RECORD: GenericCredWrapper = {
+  "@context": SCHEMA_ORG_CONTEXT,
+  "@type": "",
+  claim: {},
+  id: "",
+  issuedAt: "",
+  issuer: "",
+};
 
 // a summary record; the VC is found the fullClaim field
 export interface GiveSummaryRecord {
@@ -115,7 +109,6 @@ export interface PlanSummaryRecord {
   endTime?: string;
   fulfillsPlanHandleId: string;
   handleId: string;
-  image?: string;
   issuerDid: string;
   locLat?: number;
   locLon?: number;
@@ -126,7 +119,7 @@ export interface PlanSummaryRecord {
 
 // Note that previous VCs may have additional fields.
 // https://endorser.ch/doc/html/transactions.html#id4
-export interface GiveVerifiableCredential extends GenericVerifiableCredential {
+export interface GiveVerifiableCredential {
   "@context"?: string; // optional when embedded, eg. in an Agree
   "@type": "GiveAction";
   agent?: { identifier: string };
@@ -140,23 +133,22 @@ export interface GiveVerifiableCredential extends GenericVerifiableCredential {
 
 // Note that previous VCs may have additional fields.
 // https://endorser.ch/doc/html/transactions.html#id8
-export interface OfferVerifiableCredential extends GenericVerifiableCredential {
-  "@context"?: string; // optional when embedded... though it doesn't make sense to agree to an offer
+export interface OfferVerifiableCredential {
+  "@context"?: string; // optional when embedded, eg. in an Agree
   "@type": "Offer";
-  description?: string; // conditions for the offer
+  description?: string;
   includesObject?: { amountOfThisGood: number; unitCode: string };
   itemOffered?: {
-    description?: string; // description of the item
+    description?: string;
     isPartOf?: { identifier?: string; lastClaimId?: string; "@type"?: string };
   };
   offeredBy?: { identifier: string };
-  recipient?: { identifier: string };
   validThrough?: string;
 }
 
 // Note that previous VCs may have additional fields.
 // https://endorser.ch/doc/html/transactions.html#id7
-export interface PlanVerifiableCredential extends GenericVerifiableCredential {
+export interface PlanVerifiableCredential {
   "@context": "https://schema.org";
   "@type": "PlanAction";
   name: string;
@@ -173,7 +165,7 @@ export interface PlanVerifiableCredential extends GenericVerifiableCredential {
  * Represents data about a project
  *
  * @deprecated
- * We should use PlanSummaryRecord instead.
+ * We should use PlanServerRecord instead.
  **/
 export interface PlanData {
   /**
@@ -188,13 +180,12 @@ export interface PlanData {
    * URL referencing information about the project
    **/
   handleId: string;
-  image?: string;
   /**
    * The DID of the issuer
    */
   issuerDid: string;
   /**
-   * The identifier of the project -- different from jwtId, needs to be fixed
+   * The Identier of the project -- different from jwtId, needs to be fixed
    **/
   rowid?: string;
 }
@@ -268,6 +259,10 @@ export type CreateAndSubmitClaimResult = SuccessResult | ErrorResult;
 // See https://github.com/trentlarson/endorser-ch/blob/0cb626f803028e7d9c67f095858a9fc8542e3dbd/server/api/services/util.js#L6
 const HIDDEN_DID = "did:none:HIDDEN";
 
+const planCache: LRUCache<string, PlanSummaryRecord> = new LRUCache({
+  max: 500,
+});
+
 export function isDid(did: string) {
   return did.startsWith("did:");
 }
@@ -399,8 +394,7 @@ export function contactForDid(
  * @param activeDid
  * @param contact
  * @param allMyDids
- * @return { known: boolean, displayName: string, profileImageUrl?: string }
- *  where 'known' is true if they are in the contacts
+ * @return { known: boolean, displayName: string } where known is true if the display name is some easily-recogizable name, false if it's a generic name like "Someone Anonymous"
  */
 export function didInfoForContact(
   did: string | undefined,
@@ -408,16 +402,15 @@ export function didInfoForContact(
   contact?: Contact,
   allMyDids: string[] = [],
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-): { known: boolean; displayName: string; profileImageUrl?: string } {
-  if (!did) return { displayName: "Someone Unnamed/Unknown", known: false };
-  if (did === activeDid) {
-    return { displayName: "You", known: true };
-  } else if (contact) {
+): { known: boolean; displayName: string } {
+  if (!did) return { displayName: "Someone Anonymous", known: false };
+  if (contact) {
     return {
       displayName: contact.name || "Contact With No Name",
-      known: !!contact,
-      profileImageUrl: contact.profileImageUrl,
+      known: !!contact.name,
     };
+  } else if (did === activeDid) {
+    return { displayName: "You", known: true };
   } else {
     const myId = R.find(R.equals(did), allMyDids);
     return myId
@@ -446,80 +439,29 @@ export function didInfo(
   return didInfoForContact(did, activeDid, contact, allMyDids).displayName;
 }
 
-let passkeyAccessToken: string = "";
-let passkeyTokenExpirationEpochSeconds: number = 0;
-
-export function clearPasskeyToken() {
-  passkeyAccessToken = "";
-  passkeyTokenExpirationEpochSeconds = 0;
-}
-
-export function tokenExpiryTimeDescription() {
-  if (
-    !passkeyAccessToken ||
-    passkeyTokenExpirationEpochSeconds < new Date().getTime() / 1000
-  ) {
-    return "Token has expired";
-  } else {
-    return (
-      "Token expires at " +
-      new Date(passkeyTokenExpirationEpochSeconds * 1000).toLocaleString()
-    );
-  }
-}
-
-/**
- * Get the headers for a request, potentially including Authorization
- */
-export async function getHeaders(did?: string) {
-  const headers: { "Content-Type": string; Authorization?: string } = {
+async function getHeaders(identity: IIdentifier | null) {
+  const headers: RawAxiosRequestHeaders = {
     "Content-Type": "application/json",
   };
-  if (did) {
-    let token;
-    const account = await getAccount(did);
-    if (account?.passkeyCredIdHex) {
-      if (
-        passkeyAccessToken &&
-        passkeyTokenExpirationEpochSeconds > Date.now() / 1000
-      ) {
-        // there's an active current passkey token
-        token = passkeyAccessToken;
-      } else {
-        // there's no current passkey token or it's expired
-        token = await accessToken(did);
-
-        passkeyAccessToken = token;
-        const passkeyExpirationSeconds = await getPasskeyExpirationSeconds();
-        passkeyTokenExpirationEpochSeconds =
-          Date.now() / 1000 + passkeyExpirationSeconds;
-      }
-    } else {
-      token = await accessToken(did);
-    }
+  if (identity) {
+    const token = await accessToken(identity);
     headers["Authorization"] = "Bearer " + token;
-  } else {
-    // it's often OK to request without auth; we assume necessary checks are done earlier
   }
   return headers;
 }
 
-const planCache: LRUCache<string, PlanSummaryRecord> = new LRUCache({
-  max: 500,
-});
-
 /**
- * @param handleId nullable, in which case "undefined" will be returned
- * @param requesterDid optional, in which case no private info will be returned
+ * @param handleId nullable -- which means that "undefined" will be returned
+ * @param identity nullable -- which means no private info will be returned
  * @param axios
  * @param apiServer
  */
 export async function getPlanFromCache(
   handleId: string | null,
+  identity: IIdentifier | null,
   axios: Axios,
   apiServer: string,
-  requesterDid?: string,
-): Promise<PlanSummaryRecord | undefined> {
+) {
   if (!handleId) {
     return undefined;
   }
@@ -529,14 +471,14 @@ export async function getPlanFromCache(
       apiServer +
       "/api/v2/report/plans?handleId=" +
       encodeURIComponent(handleId);
-    const headers = await getHeaders(requesterDid);
+    const headers = await getHeaders(identity);
     try {
       const resp = await axios.get(url, { headers });
       if (resp.status === 200 && resp.data?.data?.length > 0) {
         cred = resp.data.data[0];
         planCache.set(handleId, cred);
       } else {
-        console.error(
+        console.log(
           "Failed to load plan with handle",
           handleId,
           " Got data:",
@@ -544,7 +486,7 @@ export async function getPlanFromCache(
         );
       }
     } catch (error) {
-      console.error(
+      console.log(
         "Failed to load plan with handle",
         handleId,
         " Got error:",
@@ -563,13 +505,19 @@ export async function setPlanInCache(
 }
 
 /**
- * Construct GiveAction VC for submission to server
+ * For result, see https://api.endorser.ch/api-docs/#/claims/post_api_v2_claim
  *
- * @param lastClaimId supplied when editing a previous claim
+ * @param identity
+ * @param fromDid may be null
+ * @param toDid
+ * @param description may be null; should have this or amount
+ * @param amount may be null; should have this or description
  */
-export function hydrateGive(
-  vcClaimOrig?: GiveVerifiableCredential,
-  fromDid?: string,
+export async function createAndSubmitGive(
+  axios: Axios,
+  apiServer: string,
+  identity: IIdentifier,
+  fromDid?: string | null,
   toDid?: string,
   description?: string,
   amount?: number,
@@ -578,279 +526,87 @@ export function hydrateGive(
   fulfillsOfferHandleId?: string,
   isTrade: boolean = false,
   imageUrl?: string,
-  lastClaimId?: string,
-): GiveVerifiableCredential {
-  // Remember: replace values or erase if it's null
-
-  const vcClaim: GiveVerifiableCredential = vcClaimOrig
-    ? R.clone(vcClaimOrig)
-    : {
-        "@context": SCHEMA_ORG_CONTEXT,
-        "@type": "GiveAction",
-      };
-
-  if (lastClaimId) {
-    // this is an edit
-    vcClaim.lastClaimId = lastClaimId;
-    delete vcClaim.identifier;
-  }
-
-  vcClaim.agent = fromDid ? { identifier: fromDid } : undefined;
-  vcClaim.recipient = toDid ? { identifier: toDid } : undefined;
-  vcClaim.description = description || undefined;
-  vcClaim.object =
-    amount && !isNaN(amount)
+): Promise<CreateAndSubmitClaimResult> {
+  const vcClaim: GiveVerifiableCredential = {
+    "@context": "https://schema.org",
+    "@type": "GiveAction",
+    recipient: toDid ? { identifier: toDid } : undefined,
+    agent: fromDid ? { identifier: fromDid } : undefined,
+    description: description || undefined,
+    object: amount
       ? { amountOfThisGood: amount, unitCode: unitCode || "HUR" }
-      : undefined;
-
-  // ensure fulfills is an array
-  if (!Array.isArray(vcClaim.fulfills)) {
-    vcClaim.fulfills = vcClaim.fulfills ? [vcClaim.fulfills] : [];
-  }
-  // ... and replace or add each element, ending with Trade or Donate
-  // I realize the following doesn't change any elements that are not PlanAction or Offer or Trade/Action.
-  vcClaim.fulfills = vcClaim.fulfills.filter(
-    (elem) => elem["@type"] !== "PlanAction",
-  );
+      : undefined,
+    fulfills: [{ "@type": isTrade ? "TradeAction" : "DonateAction" }],
+  };
   if (fulfillsProjectHandleId) {
+    vcClaim.fulfills = vcClaim.fulfills || []; // weird that it won't typecheck without this
     vcClaim.fulfills.push({
       "@type": "PlanAction",
       identifier: fulfillsProjectHandleId,
     });
   }
-  vcClaim.fulfills = vcClaim.fulfills.filter(
-    (elem) => elem["@type"] !== "Offer",
-  );
   if (fulfillsOfferHandleId) {
+    vcClaim.fulfills = vcClaim.fulfills || []; // weird that it won't typecheck without this
     vcClaim.fulfills.push({
       "@type": "Offer",
       identifier: fulfillsOfferHandleId,
     });
   }
-  // do Trade/Donate last because current endorser.ch only looks at the first for plans & offers
-  vcClaim.fulfills = vcClaim.fulfills.filter(
-    (elem) =>
-      elem["@type"] !== "DonateAction" && elem["@type"] !== "TradeAction",
-  );
-  vcClaim.fulfills.push({ "@type": isTrade ? "TradeAction" : "DonateAction" });
-
-  vcClaim.image = imageUrl || undefined;
-
-  return vcClaim;
-}
-
-/**
- *  For result, see https://api.endorser.ch/api-docs/#/claims/post_api_v2_claim
- *
- * @param fromDid may be null
- * @param toDid
- * @param description may be null
- * @param amount may be null
- */
-export async function createAndSubmitGive(
-  axios: Axios,
-  apiServer: string,
-  issuerDid: string,
-  fromDid?: string,
-  toDid?: string,
-  description?: string,
-  amount?: number,
-  unitCode?: string,
-  fulfillsProjectHandleId?: string,
-  fulfillsOfferHandleId?: string,
-  isTrade: boolean = false,
-  imageUrl?: string,
-): Promise<CreateAndSubmitClaimResult> {
-  const vcClaim = hydrateGive(
-    undefined,
-    fromDid,
-    toDid,
-    description,
-    amount,
-    unitCode,
-    fulfillsProjectHandleId,
-    fulfillsOfferHandleId,
-    isTrade,
-    imageUrl,
-    undefined,
-  );
+  if (imageUrl) {
+    vcClaim.image = imageUrl;
+  }
   return createAndSubmitClaim(
-    vcClaim as GenericVerifiableCredential,
-    issuerDid,
+    vcClaim as GenericCredWrapper,
+    identity,
     apiServer,
     axios,
   );
 }
 
-/**
- * For result, see https://api.endorser.ch/api-docs/#/claims/post_api_v2_claim
- *
- * @param fromDid may be null
- * @param toDid may be null if project is provided
- * @param description may be null
- * @param amount may be null
- */
-export async function editAndSubmitGive(
-  axios: Axios,
-  apiServer: string,
-  fullClaim: GenericCredWrapper<GiveVerifiableCredential>,
-  issuerDid: string,
-  fromDid?: string,
-  toDid?: string,
-  description?: string,
-  amount?: number,
-  unitCode?: string,
-  fulfillsProjectHandleId?: string,
-  fulfillsOfferHandleId?: string,
-  isTrade: boolean = false,
-  imageUrl?: string,
-): Promise<CreateAndSubmitClaimResult> {
-  const vcClaim = hydrateGive(
-    fullClaim.claim,
-    fromDid,
-    toDid,
-    description,
-    amount,
-    unitCode,
-    fulfillsProjectHandleId,
-    fulfillsOfferHandleId,
-    isTrade,
-    imageUrl,
-    fullClaim.id,
-  );
-  return createAndSubmitClaim(
-    vcClaim as GenericVerifiableCredential,
-    issuerDid,
-    apiServer,
-    axios,
-  );
-}
-
-/**
- * Construct Offer VC for submission to server
- *
- * @param lastClaimId supplied when editing a previous claim
- */
-export function hydrateOffer(
-  vcClaimOrig?: OfferVerifiableCredential,
-  fromDid?: string,
-  toDid?: string,
-  itemDescription?: string,
-  amount?: number,
-  unitCode?: string,
-  conditionDescription?: string,
-  fulfillsProjectHandleId?: string,
-  validThrough?: string,
-  lastClaimId?: string,
-): OfferVerifiableCredential {
-  // Remember: replace values or erase if it's null
-
-  const vcClaim: OfferVerifiableCredential = vcClaimOrig
-    ? R.clone(vcClaimOrig)
-    : {
-        "@context": SCHEMA_ORG_CONTEXT,
-        "@type": "Offer",
-      };
-
-  if (lastClaimId) {
-    // this is an edit
-    vcClaim.lastClaimId = lastClaimId;
-    delete vcClaim.identifier;
-  }
-
-  vcClaim.offeredBy = fromDid ? { identifier: fromDid } : undefined;
-  vcClaim.recipient = toDid ? { identifier: toDid } : undefined;
-  vcClaim.description = conditionDescription || undefined;
-
-  vcClaim.includesObject =
-    amount && !isNaN(amount)
-      ? { amountOfThisGood: amount, unitCode: unitCode || "HUR" }
-      : undefined;
-
-  if (itemDescription || fulfillsProjectHandleId) {
-    vcClaim.itemOffered = vcClaim.itemOffered || {};
-    vcClaim.itemOffered.description = itemDescription || undefined;
-    if (fulfillsProjectHandleId) {
-      vcClaim.itemOffered.isPartOf = {
-        "@type": "PlanAction",
-        identifier: fulfillsProjectHandleId,
-      };
-    }
-  }
-  vcClaim.validThrough = validThrough || undefined;
-
-  return vcClaim;
-}
-
 /**
  * For result, see https://api.endorser.ch/api-docs/#/claims/post_api_v2_claim
  *
  * @param identity
- * @param description may be null
- * @param amount may be null
- * @param validThrough ISO 8601 date string YYYY-MM-DD (may be null)
+ * @param description may be null; should have this or amount
+ * @param amount may be null; should have this or description
+ * @param expirationDate ISO 8601 date string YYYY-MM-DD (may be null)
  * @param fulfillsProjectHandleId ID of project to which this contributes (may be null)
  */
 export async function createAndSubmitOffer(
   axios: Axios,
   apiServer: string,
-  issuerDid: string,
-  itemDescription: string,
+  identity: IIdentifier,
+  description?: string,
   amount?: number,
   unitCode?: string,
-  conditionDescription?: string,
-  validThrough?: string,
-  recipientDid?: string,
+  expirationDate?: string,
   fulfillsProjectHandleId?: string,
 ): Promise<CreateAndSubmitClaimResult> {
-  const vcClaim = hydrateOffer(
-    undefined,
-    issuerDid,
-    recipientDid,
-    itemDescription,
-    amount,
-    unitCode,
-    conditionDescription,
-    fulfillsProjectHandleId,
-    validThrough,
-    undefined,
-  );
+  const vcClaim: OfferVerifiableCredential = {
+    "@context": "https://schema.org",
+    "@type": "Offer",
+    offeredBy: { identifier: identity.did },
+    validThrough: expirationDate || undefined,
+  };
+  if (amount) {
+    vcClaim.includesObject = {
+      amountOfThisGood: amount,
+      unitCode: unitCode || "HUR",
+    };
+  }
+  if (description) {
+    vcClaim.itemOffered = { description };
+  }
+  if (fulfillsProjectHandleId) {
+    vcClaim.itemOffered = vcClaim.itemOffered || {};
+    vcClaim.itemOffered.isPartOf = {
+      "@type": "PlanAction",
+      identifier: fulfillsProjectHandleId,
+    };
+  }
   return createAndSubmitClaim(
-    vcClaim as OfferVerifiableCredential,
-    issuerDid,
-    apiServer,
-    axios,
-  );
-}
-
-export async function editAndSubmitOffer(
-  axios: Axios,
-  apiServer: string,
-  fullClaim: GenericCredWrapper<OfferVerifiableCredential>,
-  issuerDid: string,
-  itemDescription: string,
-  amount?: number,
-  unitCode?: string,
-  conditionDescription?: string,
-  validThrough?: string,
-  recipientDid?: string,
-  fulfillsProjectHandleId?: string,
-): Promise<CreateAndSubmitClaimResult> {
-  const vcClaim = hydrateOffer(
-    fullClaim.claim,
-    issuerDid,
-    recipientDid,
-    itemDescription,
-    amount,
-    unitCode,
-    conditionDescription,
-    fulfillsProjectHandleId,
-    validThrough,
-    fullClaim.id,
-  );
-  return createAndSubmitClaim(
-    vcClaim as OfferVerifiableCredential,
-    issuerDid,
+    vcClaim as GenericCredWrapper,
+    identity,
     apiServer,
     axios,
   );
@@ -858,7 +614,7 @@ export async function editAndSubmitOffer(
 
 // similar logic is found in endorser-mobile
 export const createAndSubmitConfirmation = async (
-  issuerDid: string,
+  identifier: IIdentifier,
   claim: GenericVerifiableCredential,
   lastClaimId: string, // used to set the lastClaimId
   handleId: string | undefined,
@@ -871,16 +627,16 @@ export const createAndSubmitConfirmation = async (
     ),
   );
   const confirmationClaim: GenericVerifiableCredential = {
-    "@context": SCHEMA_ORG_CONTEXT,
+    "@context": "https://schema.org",
     "@type": "AgreeAction",
     object: goodClaim,
   };
-  return createAndSubmitClaim(confirmationClaim, issuerDid, apiServer, axios);
+  return createAndSubmitClaim(confirmationClaim, identifier, apiServer, axios);
 };
 
 export async function createAndSubmitClaim(
   vcClaim: GenericVerifiableCredential,
-  issuerDid: string,
+  identity: IIdentifier,
   apiServer: string,
   axios: Axios,
 ): Promise<CreateAndSubmitClaimResult> {
@@ -893,22 +649,41 @@ export async function createAndSubmitClaim(
       },
     };
 
-    const vcJwt: string = await createEndorserJwtForDid(issuerDid, vcPayload);
+    // Create a signature using private key of identity
+    const firstKey = identity.keys[0];
+    const privateKeyHex = firstKey?.privateKeyHex;
+
+    if (!privateKeyHex) {
+      throw {
+        error: "No private key",
+        message: `Your identifier ${identity.did} is not configured correctly. Use a different identifier.`,
+      };
+    }
+
+    const signer = await SimpleSigner(privateKeyHex);
+
+    // Create a JWT for the request
+    const vcJwt: string = await didJwt.createJWT(vcPayload, {
+      issuer: identity.did,
+      signer,
+    });
 
     // Make the xhr request payload
     const payload = JSON.stringify({ jwtEncoded: vcJwt });
     const url = `${apiServer}/api/v2/claim`;
+    const token = await accessToken(identity);
 
     const response = await axios.post(url, payload, {
       headers: {
         "Content-Type": "application/json",
+        Authorization: `Bearer ${token}`,
       },
     });
 
     return { type: "success", response };
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   } catch (error: any) {
-    console.error("Error submitting claim:", error);
+    console.error("Error creating claim:", error);
     const errorMessage: string =
       error.response?.data?.error?.message ||
       error.message ||
@@ -923,20 +698,6 @@ export async function createAndSubmitClaim(
   }
 }
 
-export async function createEndorserJwtForDid(
-  issuerDid: string,
-  payload: object,
-) {
-  const account = await getAccount(issuerDid);
-  return createEndorserJwtForKey(account as KeyMeta, payload);
-}
-
-/**
- * An AcceptAction is when someone accepts some contract or pledge.
- *
- * @param claim has properties '@context' & '@type'
- * @return true if the claim is a schema.org AcceptAction
- */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const isAccept = (claim: Record<string, any>) => {
   return (
@@ -977,29 +738,24 @@ export const capitalizeAndInsertSpacesBeforeCaps = (text: string) => {
  similar code is also contained in endorser-mobile
  **/
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const claimSummary = (
-  claim: GenericCredWrapper<GenericVerifiableCredential>,
-) => {
+const claimSummary = (claim: Record<string, any>) => {
   if (!claim) {
     // to differentiate from "something" above
     return "something";
   }
-  let specificClaim:
-    | GenericVerifiableCredential
-    | GenericCredWrapper<GenericVerifiableCredential> = claim;
   if (claim.claim) {
     // probably a Verified Credential
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    specificClaim = claim.claim;
+    claim = claim.claim as Record<string, any>;
   }
-  if (Array.isArray(specificClaim)) {
-    if (specificClaim.length === 1) {
-      specificClaim = specificClaim[0];
+  if (Array.isArray(claim)) {
+    if (claim.length === 1) {
+      claim = claim[0];
     } else {
       return "multiple claims";
     }
   }
-  const type = specificClaim["@type"];
+  const type = claim["@type"];
   if (!type) {
     return "a claim";
   } else {
@@ -1020,7 +776,7 @@ const claimSummary = (
  similar code is also contained in endorser-mobile
  **/
 export const claimSpecialDescription = (
-  record: GenericCredWrapper<GenericVerifiableCredential>,
+  record: GenericCredWrapper,
   activeDid: string,
   identifiers: Array<string>,
   contacts: Array<Contact>,
@@ -1114,11 +870,7 @@ export const claimSpecialDescription = (
       "...]"
     );
   } else {
-    return (
-      issuer +
-      " declared " +
-      claimSummary(claim as GenericCredWrapper<GenericVerifiableCredential>)
-    );
+    return issuer + " declared " + claimSummary(claim as GenericCredWrapper);
   }
 };
 
@@ -1142,131 +894,3 @@ export const bvcMeetingJoinClaim = (did: string, startTime: string) => {
     },
   };
 };
-
-export async function createEndorserJwtVcFromClaim(
-  issuerDid: string,
-  claim: object,
-) {
-  // Make a payload for the claim
-  const vcPayload = {
-    vc: {
-      "@context": ["https://www.w3.org/2018/credentials/v1"],
-      type: ["VerifiableCredential"],
-      credentialSubject: claim,
-    },
-  };
-  return createEndorserJwtForDid(issuerDid, vcPayload);
-}
-
-export async function register(
-  activeDid: string,
-  apiServer: string,
-  axios: Axios,
-  contact: Contact,
-) {
-  const vcClaim: RegisterVerifiableCredential = {
-    "@context": SCHEMA_ORG_CONTEXT,
-    "@type": "RegisterAction",
-    agent: { identifier: activeDid },
-    object: SERVICE_ID,
-    participant: { identifier: contact.did },
-  };
-  // Make a payload for the claim
-  const vcPayload = {
-    vc: {
-      "@context": ["https://www.w3.org/2018/credentials/v1"],
-      type: ["VerifiableCredential"],
-      credentialSubject: vcClaim,
-    },
-  };
-  // Create a signature using private key of identity
-  const vcJwt = await createEndorserJwtForDid(activeDid, vcPayload);
-
-  const url = apiServer + "/api/v2/claim";
-  const resp = await axios.post(url, { jwtEncoded: vcJwt });
-  if (resp.data?.success?.handleId) {
-    return { success: true };
-  } else if (resp.data?.success?.embeddedRecordError) {
-    let message =
-      "There was some problem with the registration and so it may not be complete.";
-    if (typeof resp.data.success.embeddedRecordError == "string") {
-      message += " " + resp.data.success.embeddedRecordError;
-    }
-    return { error: message };
-  } else {
-    console.error(resp);
-    return { error: "Got a server error when registering." };
-  }
-}
-
-export async function setVisibilityUtil(
-  activeDid: string,
-  apiServer: string,
-  axios: Axios,
-  db: NonsensitiveDexie,
-  contact: Contact,
-  visibility: boolean,
-) {
-  if (!activeDid) {
-    return { error: "Cannot set visibility without an identifier." };
-  }
-  const url =
-    apiServer + "/api/report/" + (visibility ? "canSeeMe" : "cannotSeeMe");
-  const headers = await getHeaders(activeDid);
-  const payload = JSON.stringify({ did: contact.did });
-
-  try {
-    const resp = await axios.post(url, payload, { headers });
-    if (resp.status === 200) {
-      const success = resp.data.success;
-      if (success) {
-        db.contacts.update(contact.did, { seesMe: visibility });
-      }
-      return { success };
-    } else {
-      console.error(
-        "Got some bad server response when setting visibility: ",
-        resp.status,
-        resp,
-      );
-      const message =
-        resp.data.error?.message || "Got some error setting visibility.";
-      return { error: message };
-    }
-  } catch (err) {
-    console.error("Got some error when setting visibility:", err);
-    return { error: "Check connectivity and try again." };
-  }
-}
-
-/**
- * Fetches rate limits from the Endorser server.
- *
- * @param apiServer endorser server URL string
- * @param axios Axios instance
- * @param {string} issuerDid - The DID for which to check rate limits.
- * @returns {Promise<AxiosResponse>} The Axios response object.
- */
-export async function fetchEndorserRateLimits(
-  apiServer: string,
-  axios: Axios,
-  issuerDid: string,
-) {
-  const url = `${apiServer}/api/report/rateLimits`;
-  const headers = await getHeaders(issuerDid);
-  return await axios.get(url, { headers } as AxiosRequestConfig);
-}
-
-/**
- * Fetches rate limits from the image server.
- *
- * @param apiServer image server URL string
- * @param axios Axios instance
- * @param {string} issuerDid - The DID for which to check rate limits.
- * @returns {Promise<AxiosResponse>} The Axios response object.
- */
-export async function fetchImageRateLimits(axios: Axios, issuerDid: string) {
-  const url = DEFAULT_IMAGE_API_SERVER + "/image-limits";
-  const headers = await getHeaders(issuerDid);
-  return await axios.get(url, { headers } as AxiosRequestConfig);
-}

src/libs/util.ts

@@ -1,37 +1,23 @@
 // many of these are also found in endorser-mobile utility.ts
 
 import axios, { AxiosResponse } from "axios";
+import { IIdentifier } from "@veramo/core";
 import { useClipboard } from "@vueuse/core";
 
 import { DEFAULT_PUSH_SERVER } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { Account } from "@/db/tables/accounts";
-import {
-  DEFAULT_PASSKEY_EXPIRATION_MINUTES,
-  MASTER_SETTINGS_KEY,
-} from "@/db/tables/settings";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { deriveAddress, generateSeed, newIdentifier } from "@/libs/crypto";
-import {
-  containsHiddenDid,
-  GenericCredWrapper,
-  GenericVerifiableCredential,
-  OfferVerifiableCredential,
-} from "@/libs/endorserServer";
+import { GenericCredWrapper, containsHiddenDid } from "@/libs/endorserServer";
 import * as serverUtil from "@/libs/endorserServer";
-import { registerCredential } from "@/libs/crypto/vc/passkeyDidPeer";
-
-import { Buffer } from "buffer";
-import { KeyMeta } from "@/libs/crypto/vc";
-import { createPeerDid } from "@/libs/crypto/vc/didPeer";
 
 export const PRIVACY_MESSAGE =
-  "The data you send will be visible to the world -- except: your IDs and the IDs of anyone you tag will stay private, only visible to them and others you explicitly allow.";
-export const SHARED_PHOTO_BASE64_KEY = "shared-photo-base64";
+  "The data you send be visible to the world -- except: your IDs and the IDs of anyone you tag will stay private, only visible to those you allow.";
 
 /* eslint-disable prettier/prettier */
 export const UNIT_SHORT: Record<string, string> = {
   "BTC": "BTC",
-  "BX": "BX",
   "ETH": "ETH",
   "HUR": "Hours",
   "USD": "US $",
@@ -41,7 +27,6 @@ export const UNIT_SHORT: Record<string, string> = {
 /* eslint-disable prettier/prettier */
 export const UNIT_LONG: Record<string, string> = {
   "BTC": "Bitcoin",
-  "BX": "Buxbe",
   "ETH": "Ethereum",
   "HUR": "hours",
   "USD": "dollars",
@@ -85,9 +70,7 @@ export const isGlobalUri = (uri: string) => {
   return uri && uri.match(new RegExp(/^[A-Za-z][A-Za-z0-9+.-]+:/));
 };
 
-export const isGiveAction = (
-  veriClaim: GenericCredWrapper<GenericVerifiableCredential>,
-) => {
+export const giveIsConfirmable = (veriClaim: GenericCredWrapper) => {
   return veriClaim.claimType === "GiveAction";
 };
 
@@ -103,59 +86,25 @@ export const doCopyTwoSecRedo = (text: string, fn: () => void) => {
  * @param veriClaim is expected to have fields: claim, claimType, and issuer
  */
 export const isGiveRecordTheUserCanConfirm = (
-  isRegistered: boolean,
-  veriClaim: GenericCredWrapper<GenericVerifiableCredential>,
+  veriClaim: GenericCredWrapper,
   activeDid: string,
   confirmerIdList: string[] = [],
 ) => {
   return (
-    isRegistered &&
-    isGiveAction(veriClaim) &&
+    giveIsConfirmable(veriClaim) &&
     !confirmerIdList.includes(activeDid) &&
     veriClaim.issuer !== activeDid &&
     !containsHiddenDid(veriClaim.claim)
   );
 };
 
-export async function blobToBase64(blob: Blob): Promise<string> {
-  return new Promise((resolve, reject) => {
-    const reader = new FileReader();
-    reader.onloadend = () => resolve(reader.result as string); // potential problem if it returns an ArrayBuffer?
-    reader.onerror = reject;
-    reader.readAsDataURL(blob);
-  });
-}
-
-export function base64ToBlob(base64DataUrl: string, sliceSize = 512) {
-  // Extract the content type and the Base64 data
-  const [metadata, base64] = base64DataUrl.split(",");
-  const contentTypeMatch = metadata.match(/data:(.*?);base64/);
-  const contentType = contentTypeMatch ? contentTypeMatch[1] : "";
-
-  const byteCharacters = atob(base64);
-  const byteArrays = [];
-
-  for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) {
-    const slice = byteCharacters.slice(offset, offset + sliceSize);
-
-    const byteNumbers = new Array(slice.length);
-    for (let i = 0; i < slice.length; i++) {
-      byteNumbers[i] = slice.charCodeAt(i);
-    }
-
-    const byteArray = new Uint8Array(byteNumbers);
-    byteArrays.push(byteArray);
-  }
-  return new Blob(byteArrays, { type: contentType });
-}
-
 /**
  * @returns the DID of the person who offered, or undefined if hidden
  * @param veriClaim is expected to have fields: claim and issuer
  */
-export const offerGiverDid: (
-  arg0: GenericCredWrapper<OfferVerifiableCredential>,
-) => string | undefined = (veriClaim) => {
+export const offerGiverDid: (arg0: GenericCredWrapper) => string | undefined = (
+  veriClaim,
+) => {
   let giver;
   if (
     veriClaim.claim.offeredBy?.identifier &&
@@ -172,13 +121,8 @@ export const offerGiverDid: (
  * @returns true if the user can fulfill the offer
  * @param veriClaim is expected to have fields: claim, claimType, and issuer
  */
-export const canFulfillOffer = (
-  veriClaim: GenericCredWrapper<GenericVerifiableCredential>,
-) => {
-  return !!(
-    veriClaim.claimType === "Offer" &&
-    offerGiverDid(veriClaim as GenericCredWrapper<OfferVerifiableCredential>)
-  );
+export const canFulfillOffer = (veriClaim: GenericCredWrapper) => {
+  return !!(veriClaim.claimType === "Offer" && offerGiverDid(veriClaim));
 };
 
 // return object with paths and arrays of DIDs for any keys ending in "VisibleToDid"
@@ -247,17 +191,20 @@ export function findAllVisibleToDids(
  *
  **/
 
-export interface AccountKeyInfo extends Account, KeyMeta {}
-
-export const getAccount = async (
-  activeDid: string,
-): Promise<AccountKeyInfo | undefined> => {
+export const getIdentity = async (activeDid: string): Promise<IIdentifier> => {
   await accountsDB.open();
   const account = (await accountsDB.accounts
     .where("did")
     .equals(activeDid)
     .first()) as Account;
-  return account;
+  const identity = JSON.parse(account?.identity || "null");
+
+  if (!identity) {
+    throw new Error(
+      `Attempted to load Offer records for DID ${activeDid} but no identifier was found`,
+    );
+  }
+  return identity;
 };
 
 /**
@@ -290,47 +237,6 @@ export const generateSaveAndActivateIdentity = async (): Promise<string> => {
   return newId.did;
 };
 
-export const registerAndSavePasskey = async (
-  keyName: string,
-): Promise<Account> => {
-  const cred = await registerCredential(keyName);
-  const publicKeyBytes = cred.publicKeyBytes;
-  const did = createPeerDid(publicKeyBytes as Uint8Array);
-  const passkeyCredIdHex = cred.credIdHex as string;
-
-  const account = {
-    dateCreated: new Date().toISOString(),
-    did,
-    passkeyCredIdHex,
-    publicKeyHex: Buffer.from(publicKeyBytes).toString("hex"),
-  };
-  await accountsDB.open();
-  await accountsDB.accounts.add(account);
-  return account;
-};
-
-export const registerSaveAndActivatePasskey = async (
-  keyName: string,
-): Promise<Account> => {
-  const account = await registerAndSavePasskey(keyName);
-
-  await db.open();
-  await db.settings.update(MASTER_SETTINGS_KEY, {
-    activeDid: account.did,
-  });
-
-  return account;
-};
-
-export const getPasskeyExpirationSeconds = async (): Promise<number> => {
-  await db.open();
-  const settings = await db.settings.get(MASTER_SETTINGS_KEY);
-  const passkeyExpirationSeconds =
-    (settings?.passkeyExpirationMinutes ?? DEFAULT_PASSKEY_EXPIRATION_MINUTES) *
-    60;
-  return passkeyExpirationSeconds;
-};
-
 export const sendTestThroughPushServer = async (
   subscriptionJSON: PushSubscriptionJSON,
   skipFilter: boolean,

src/main.ts

@@ -1,5 +1,5 @@
 import { createPinia } from "pinia";
-import { App as VueApp, ComponentPublicInstance, createApp } from "vue";
+import { createApp } from "vue";
 import App from "./App.vue";
 import "./registerServiceWorker";
 import router from "./router";
@@ -11,12 +11,9 @@ import "./assets/styles/tailwind.css";
 
 import { library } from "@fortawesome/fontawesome-svg-core";
 import {
-  faArrowDown,
   faArrowLeft,
   faArrowRight,
-  faArrowRotateBackward,
   faArrowUpRightFromSquare,
-  faArrowUp,
   faBan,
   faBitcoinSign,
   faBurst,
@@ -37,7 +34,6 @@ import {
   faComment,
   faCopy,
   faDollar,
-  faEllipsis,
   faEllipsisVertical,
   faEye,
   faEyeSlash,
@@ -49,10 +45,8 @@ import {
   faGlobe,
   faHammer,
   faHand,
-  faHandHoldingDollar,
   faHandHoldingHeart,
   faHouseChimney,
-  faImagePortrait,
   faLeftRight,
   faLocationDot,
   faLongArrowAltLeft,
@@ -69,7 +63,6 @@ import {
   faRotate,
   faShareNodes,
   faSpinner,
-  faSquare,
   faSquareCaretDown,
   faSquareCaretUp,
   faSquarePlus,
@@ -81,12 +74,9 @@ import {
 } from "@fortawesome/free-solid-svg-icons";
 
 library.add(
-  faArrowDown,
   faArrowLeft,
   faArrowRight,
-  faArrowRotateBackward,
   faArrowUpRightFromSquare,
-  faArrowUp,
   faBan,
   faBitcoinSign,
   faBurst,
@@ -107,7 +97,6 @@ library.add(
   faComment,
   faCopy,
   faDollar,
-  faEllipsis,
   faEllipsisVertical,
   faEye,
   faEyeSlash,
@@ -119,10 +108,8 @@ library.add(
   faGlobe,
   faHammer,
   faHand,
-  faHandHoldingDollar,
   faHandHoldingHeart,
   faHouseChimney,
-  faImagePortrait,
   faLeftRight,
   faLocationDot,
   faLongArrowAltLeft,
@@ -139,7 +126,6 @@ library.add(
   faRotate,
   faShareNodes,
   faSpinner,
-  faSquare,
   faSquareCaretDown,
   faSquareCaretUp,
   faSquarePlus,
@@ -153,38 +139,11 @@ library.add(
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import Camera from "simple-vue-camera";
 
-// Can trigger this with a 'throw' inside some top-level function, eg. on the HomeView
-function setupGlobalErrorHandler(app: VueApp) {
-  // @ts-expect-error 'cause we cannot see why config is not defined
-  app.config.errorHandler = (
-    err: Error,
-    instance: ComponentPublicInstance | null,
-    info: string,
-  ) => {
-    console.error(
-      "Ouch! Global Error Handler. Info:",
-      info,
-      "Error:",
-      err,
-      "Instance:",
-      instance,
-    );
-    // Want to show a nice notiwind notification but can't figure out how.
-    alert(
-      (err.message || "Something bad happened") +
-        " - Try reloading or restarting the app.",
-    );
-  };
-}
-
-const app = createApp(App)
+createApp(App)
   .component("fa", FontAwesomeIcon)
   .component("camera", Camera)
   .use(createPinia())
   .use(VueAxios, axios)
   .use(router)
-  .use(Notifications);
-
-setupGlobalErrorHandler(app);
-
-app.mount("#app");
+  .use(Notifications)
+  .mount("#app");

src/registerServiceWorker.ts

@@ -2,7 +2,6 @@
 
 import { register } from "register-service-worker";
 
-// NODE_ENV is "production" by default with "vite build". See https://vitejs.dev/guide/env-and-mode
 if (import.meta.env.NODE_ENV === "production") {
   register("/sw_scripts-combined.js", {
     ready() {

src/router/index.ts

@@ -38,36 +38,21 @@ const routes: Array<RouteRecordRaw> = [
     name: "claim",
     component: () => import("../views/ClaimView.vue"),
   },
-  {
-    path: "/claim-add-raw/:id?",
-    name: "claim-add-raw",
-    component: () => import("../views/ClaimAddRawView.vue"),
-  },
   {
     path: "/confirm-contact",
     name: "confirm-contact",
     component: () => import("../views/ConfirmContactView.vue"),
   },
-  {
-    path: "/confirm-gift/:id?",
-    name: "confirm-gift",
-    component: () => import("@/views/ConfirmGiftView.vue"),
-  },
   {
     path: "/contact-amounts",
     name: "contact-amounts",
     component: () => import("../views/ContactAmountsView.vue"),
   },
   {
-    path: "/contact-gift",
-    name: "contact-gift",
+    path: "/contact-gives",
+    name: "contact-gives",
     component: () => import("../views/ContactGiftingView.vue"),
   },
-  {
-    path: "/contact-import",
-    name: "contact-import",
-    component: () => import("../views/ContactImportView.vue"),
-  },
   {
     path: "/contact-qr",
     name: "contact-qr",
@@ -78,11 +63,6 @@ const routes: Array<RouteRecordRaw> = [
     name: "contacts",
     component: () => import("../views/ContactsView.vue"),
   },
-  {
-    path: "/did/:did?",
-    name: "did",
-    component: () => import("../views/DIDView.vue"),
-  },
   {
     path: "/discover",
     name: "discover",
@@ -91,7 +71,7 @@ const routes: Array<RouteRecordRaw> = [
   {
     path: "/gifted-details",
     name: "gifted-details",
-    component: () => import("@/views/GiftedDetailsView.vue"),
+    component: () => import("../views/GiftedDetails.vue"),
   },
   {
     path: "/help",
@@ -143,11 +123,6 @@ const routes: Array<RouteRecordRaw> = [
     name: "new-identifier",
     component: () => import("../views/NewIdentifierView.vue"),
   },
-  {
-    path: "/offer-details/:id?",
-    name: "offer-details",
-    component: () => import("../views/OfferDetailsView.vue"),
-  },
   {
     path: "/project/:id?",
     name: "project",
@@ -189,14 +164,6 @@ const routes: Array<RouteRecordRaw> = [
     name: "seed-backup",
     component: () => import("../views/SeedBackupView.vue"),
   },
-  {
-    path: "/shared-photo",
-    name: "shared-photo",
-    component: () => import("@/views/SharedPhotoView.vue"),
-  },
-
-  // /share-target is also an endpoint in the service worker
-
   {
     path: "/start",
     name: "start",

src/test/index.ts

@@ -6,9 +6,6 @@ import { SERVICE_ID } from "../libs/endorserServer";
 import { deriveAddress, newIdentifier } from "../libs/crypto";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 
-/**
- * Get User #0 to sign & submit a RegisterAction for the user's activeDid.
- */
 export async function testServerRegisterUser() {
   const testUser0Mnem =
     "seminar accuse mystery assist delay law thing deal image undo guard initial shallow wrestle list fragile borrow velvet tomorrow awake explain test offer control";

src/views/ClaimAddRawView.vue

@@ -1,99 +0,0 @@
-<template>
-  <QuickNav />
-  <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
-    <!-- Breadcrumb -->
-    <div id="ViewBreadcrumb" class="mb-8">
-      <h1 class="text-lg text-center font-light relative px-7">
-        <!-- Back -->
-        <button
-          @click="$router.go(-1)"
-          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-        >
-          <fa icon="chevron-left" class="fa-fw" />
-        </button>
-        Raw Claim
-      </h1>
-    </div>
-
-    <div class="flex">
-      <textarea rows="20" class="border-2 w-full" v-model="claimStr"></textarea>
-    </div>
-    <button
-      class="block w-full text-center text-lg font-bold 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-2 py-3 rounded-md"
-      @click="submitClaim()"
-    >
-      Sign &amp; Send
-    </button>
-  </section>
-</template>
-
-<script lang="ts">
-import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
-
-import { NotificationIface } from "@/constants/app";
-import { db } from "@/db/index";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
-import * as serverUtil from "@/libs/endorserServer";
-import QuickNav from "@/components/QuickNav.vue";
-
-@Component({
-  components: { QuickNav },
-})
-export default class ClaimAddRawView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-
-  accountIdentityStr: string = "null";
-  activeDid = "";
-  apiServer = "";
-  claimStr = "";
-
-  async mounted() {
-    await db.open();
-    const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
-    this.activeDid = settings?.activeDid || "";
-    this.apiServer = settings?.apiServer || "";
-
-    this.claimStr = (this.$route as Router).query["claim"];
-    try {
-      this.veriClaim = JSON.parse(this.claimStr);
-      this.claimStr = JSON.stringify(this.veriClaim, null, 2);
-    } catch (e) {
-      // ignore a parse
-    }
-  }
-
-  async submitClaim() {
-    const fullClaim = JSON.parse(this.claimStr);
-    const result = await serverUtil.createAndSubmitClaim(
-      fullClaim,
-      this.activeDid,
-      this.apiServer,
-      this.axios,
-    );
-    if (result.type === "success") {
-      this.$notify(
-        {
-          group: "alert",
-          type: "success",
-          title: "Success",
-          text: "Claim submitted.",
-        },
-        5000,
-      );
-    } else {
-      console.error("Got error submitting the claim:", result);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "There was a problem submitting the claim. See logs for more info.",
-        },
-        -1,
-      );
-    }
-  }
-}
-</script>

src/views/ClaimView.vue

@@ -10,7 +10,7 @@
           @click="$router.go(-1)"
           class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
         >
-          <fa icon="chevron-left" class="fa-fw" />
+          <fa icon="chevron-left" class="fa-fw"></fa>
         </button>
         Verifiable Claim Details
       </h1>
@@ -22,18 +22,6 @@
         <div class="overflow-hidden">
           <h2 class="text-md font-bold">
             {{ capitalizeAndInsertSpacesBeforeCaps(veriClaim.claimType) }}
-            <button
-              v-if="
-                ['GiveAction', 'Offer'].includes(
-                  veriClaim.claimType as string,
-                ) && veriClaim.issuer === activeDid
-              "
-              @click="onClickEditClaim"
-              title="Edit"
-              data-testId="editClaimButton"
-            >
-              <fa icon="pen" class="text-sm text-blue-500 ml-2 mb-1" />
-            </button>
           </h2>
           <div class="text-sm">
             <div>
@@ -47,19 +35,16 @@
                 "
                 class="ml-2 mr-2"
               >
-                <fa icon="copy" class="text-slate-400 fa-fw" />
+                <fa icon="copy" class="text-slate-400 fa-fw"></fa>
               </button>
               <span v-show="showIdCopy">Copied ID</span>
             </div>
-            <div data-testId="description">
-              <fa icon="message" class="fa-fw text-slate-400" />
-              {{
-                veriClaim.claim?.itemOffered?.description ||
-                veriClaim.claim?.description
-              }}
+            <div>
+              <fa icon="message" class="fa-fw text-slate-400"></fa>
+              {{ veriClaim.claim?.description }}
             </div>
             <div>
-              <fa icon="user" class="fa-fw text-slate-400" />
+              <fa icon="user" class="fa-fw text-slate-400"></fa>
               {{ veriClaim.issuer }}
               <span v-if="!serverUtil.isEmptyOrHiddenDid(veriClaim.issuer)">
                 <button
@@ -71,20 +56,15 @@
                   "
                   class="ml-2 mr-2"
                 >
-                  <fa icon="copy" class="text-slate-400 fa-fw" />
+                  <fa icon="copy" class="text-slate-400 fa-fw"></fa>
                 </button>
                 <span v-show="showDidCopy">Copied DID</span>
               </span>
             </div>
             <div>
-              <fa icon="calendar" class="fa-fw text-slate-400" />
+              <fa icon="calendar" class="fa-fw text-slate-400"></fa>
               {{ veriClaim.issuedAt?.replace(/T/, " ").replace(/Z/, " UTC") }}
             </div>
-            <div v-if="veriClaim.claim.image" class="flex justify-center">
-              <a :href="veriClaim.claim.image" target="_blank">
-                <img :src="veriClaim.claim.image" class="h-24 rounded-xl" />
-              </a>
-            </div>
 
             <!-- Fullfills Links -->
 
@@ -141,7 +121,22 @@
       </div>
     </div>
 
-    <div class="mt-8">
+    <div class="columns-3">
+      <button
+        class="col-span-1 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"
+        v-if="
+          libsUtil.isGiveRecordTheUserCanConfirm(
+            veriClaim,
+            activeDid,
+            confirmerIdList,
+          )
+        "
+        @click="confirmClaim()"
+      >
+        Confirm
+        <fa icon="circle-check" class="ml-2 text-white cursor-pointer" />
+      </button>
+
       <button
         v-if="libsUtil.canFulfillOffer(veriClaim)"
         @click="openFulfillGiftDialog()"
@@ -151,37 +146,10 @@
         <fa icon="hand-holding-heart" class="ml-2 text-white cursor-pointer" />
       </button>
     </div>
+    <GiftedDialog ref="customGiveDialog" message="Offer fulfilled by" />
 
-    <div v-if="libsUtil.isGiveAction(veriClaim)">
-      <div class="flex columns-3">
-        <button
-          class="col-span-1 bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white mt-2 px-4 py-2 rounded-md"
-          v-if="
-            libsUtil.isGiveRecordTheUserCanConfirm(
-              isRegistered,
-              veriClaim,
-              activeDid,
-              confirmerIdList,
-            )
-          "
-          @click="confirmConfirmClaim()"
-        >
-          Confirm
-          <fa icon="circle-check" class="ml-2 text-white cursor-pointer" />
-        </button>
-        <h2 v-else class="font-bold uppercase text-xl mt-2">Confirmations</h2>
-
-        <span class="mt-0.5 px-4 py-2">
-          <router-link
-            v-if="libsUtil.isGiveAction(veriClaim)"
-            :to="'/confirm-gift/' + encodeURIComponent(veriClaim.id)"
-            class="col-span-1 text-blue-500"
-          >
-            Details...
-          </router-link>
-        </span>
-      </div>
-      <GiftedDialog ref="customGiveDialog" />
+    <div v-if="libsUtil.giveIsConfirmable(veriClaim)">
+      <h2 class="font-bold uppercase text-xl mt-8 mb-2">Confirmations</h2>
 
       <span v-if="totalConfirmers() === 0">Nobody has confirmed this.</span>
       <span v-else-if="totalConfirmers() === 1">
@@ -311,15 +279,13 @@
           <a @click="onClickShareClaim()" class="text-blue-500"
             >click to send them this info</a
           >
-          and see if they are willing to make an introduction. They are surely
-          connected to someone; if you don't know who to ask, you might try the
-          person who registered you.
+          and see if they are willing to make an introduction.
         </span>
         <span v-else>
           If you'd like to ask any of your contacts to take a look and see if
           their contacts can see more details,
           <a
-            @click="copyToClipboard('This page location', windowLocation)"
+            @click="copyToClipboard('Location', windowLocation)"
             class="text-blue-500"
             >share this page with them</a
           >
@@ -353,7 +319,7 @@
           class="list-disc p-4"
         >
           <div class="text-sm">
-            <fa icon="minus" class="fa-fw" />
+            <fa icon="minus" class="fa-fw"></fa>
             The {{ visibleDidPath }} is visible to:
           </div>
           <div class="ml-12 p-1">
@@ -375,7 +341,8 @@
                     </span>
                     <span v-if="veriClaim.publicUrls?.[visDid]"
                       >, found at
-                      <fa icon="globe" class="fa-fw text-slate-400" />&nbsp;<a
+                      <fa icon="globe" class="fa-fw text-slate-400"></fa
+                      >&nbsp;<a
                         :href="veriClaim.publicUrls?.[visDid]"
                         class="text-blue-500"
                         >{{
@@ -392,19 +359,9 @@
           </div>
         </div>
       </div>
-      <span v-if="isEditedGlobalId" class="mt-2">
-        This record is an edited version. The latest version is here.
-      </span>
-      <br />
-      <button @click="showVeriClaimDump = !showVeriClaimDump" class="ml-2">
-        Details
-        <fa v-if="showVeriClaimDump" icon="chevron-up" class="text-blue-400" />
-        <fa v-else icon="chevron-down" class="text-blue-400" />
-      </button>
       <!-- Keep the dump contents directly between > and < to avoid weird spacing. -->
       <pre
-        v-if="showVeriClaimDump"
-        class="text-sm overflow-x-scroll bg-slate-100 px-4 py-3 rounded-md"
+        class="text-sm overflow-x-scroll px-4 py-3 bg-slate-100 rounded-md"
         >{{ veriClaimDump }}</pre
       >
     </div>
@@ -427,10 +384,7 @@
       </button>
     </div>
     <div v-else>
-      <pre
-        class="text-sm overflow-x-scroll bg-slate-100 px-4 py-3 rounded-md"
-        >{{ fullClaimDump }}</pre
-      >
+      <pre>{{ fullClaimDump }}</pre>
     </div>
 
     <a
@@ -444,34 +398,34 @@
 </template>
 
 <script lang="ts">
-import { AxiosError } from "axios";
+import { AxiosError, RawAxiosRequestHeaders } from "axios";
 import * as yaml from "js-yaml";
 import * as R from "ramda";
+import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 import { useClipboard } from "@vueuse/core";
 
 import GiftedDialog from "@/components/GiftedDialog.vue";
+import OfferDialog from "@/components/OfferDialog.vue";
 import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { accessToken } from "@/libs/crypto";
 import * as serverUtil from "@/libs/endorserServer";
 import * as libsUtil from "@/libs/util";
 import QuickNav from "@/components/QuickNav.vue";
+import EntityIcon from "@/components/EntityIcon.vue";
 import { Account } from "@/db/tables/accounts";
-import {
-  GenericCredWrapper,
-  GiverReceiverInputInfo,
-  OfferVerifiableCredential,
-} from "@/libs/endorserServer";
+import { GiverInputInfo } from "@/libs/endorserServer";
 
 @Component({
-  components: { GiftedDialog, QuickNav },
+  components: { EntityIcon, GiftedDialog, OfferDialog, QuickNav },
 })
 export default class ClaimView extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
 
+  accountIdentityStr: string = "null";
   activeDid = "";
   allMyDids: Array<string> = [];
   allContacts: Array<Contact> = [];
@@ -486,12 +440,9 @@ export default class ClaimView extends Vue {
   fullClaim = null;
   fullClaimDump = "";
   fullClaimMessage = "";
-  isEditedGlobalId = false;
-  isRegistered = false;
   numConfsNotVisible = 0; // number of hidden DIDs in the confirmerIdList, minus the issuer if they aren't visible
   showDidCopy = false;
   showIdCopy = false;
-  showVeriClaimDump = false;
   veriClaim = serverUtil.BLANK_GENERIC_SERVER_RECORD;
   veriClaimDump = "";
   veriClaimDidsVisible = {};
@@ -511,8 +462,6 @@ export default class ClaimView extends Vue {
     this.fullClaim = null;
     this.fullClaimDump = "";
     this.fullClaimMessage = "";
-    this.isEditedGlobalId = false;
-    this.isRegistered = false;
     this.numConfsNotVisible = 0;
     this.veriClaim = serverUtil.BLANK_GENERIC_SERVER_RECORD;
     this.veriClaimDump = "";
@@ -524,18 +473,20 @@ export default class ClaimView extends Vue {
     this.activeDid = settings?.activeDid || "";
     this.apiServer = settings?.apiServer || "";
     this.allContacts = await db.contacts.toArray();
-    this.isRegistered = settings?.isRegistered || false;
 
     await accountsDB.open();
     const accounts = accountsDB.accounts;
-    const accountsArr: Array<Account> = await accounts?.toArray();
+    const accountsArr = await accounts?.toArray();
     this.allMyDids = accountsArr.map((acc) => acc.did);
+    const account = accountsArr.find((acc) => acc.did === this.activeDid);
+    this.accountIdentityStr = account?.identity || "null";
+    const identity = JSON.parse(this.accountIdentityStr);
 
     const pathParam = window.location.pathname.substring("/claim/".length);
     let claimId;
     if (pathParam) {
       claimId = decodeURIComponent(pathParam);
-      await this.loadClaim(claimId, this.activeDid);
+      await this.loadClaim(claimId, identity);
     } else {
       this.$notify(
         {
@@ -569,6 +520,33 @@ export default class ClaimView extends Vue {
     );
   }
 
+  public async getIdentity(activeDid: string): Promise<IIdentifier> {
+    await accountsDB.open();
+    const account = (await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first()) as Account;
+    const identity = JSON.parse(account?.identity || "null");
+
+    if (!identity) {
+      throw new Error(
+        "Attempted to load project records with no identifier available.",
+      );
+    }
+    return identity;
+  }
+
+  public async getHeaders(identity: IIdentifier) {
+    const headers: RawAxiosRequestHeaders = {
+      "Content-Type": "application/json",
+    };
+    if (identity) {
+      const token = await accessToken(identity);
+      headers["Authorization"] = "Bearer " + token;
+    }
+    return headers;
+  }
+
   // Isn't there a better way to make this available to the template?
   didInfo(did: string) {
     return serverUtil.didInfo(
@@ -579,12 +557,12 @@ export default class ClaimView extends Vue {
     );
   }
 
-  async loadClaim(claimId: string, userDid: string) {
+  async loadClaim(claimId: string, identity: IIdentifier) {
     const urlPath = libsUtil.isGlobalUri(claimId)
       ? "/api/claim/byHandle/"
       : "/api/claim/";
     const url = this.apiServer + urlPath + encodeURIComponent(claimId);
-    const headers = await serverUtil.getHeaders(userDid);
+    const headers = await this.getHeaders(identity);
 
     try {
       const resp = await this.axios.get(url, { headers });
@@ -610,15 +588,13 @@ export default class ClaimView extends Vue {
         return;
       }
 
-      this.isEditedGlobalId = !this.veriClaim.handleId.endsWith(claimId);
-
       // retrieve more details on Give, Offer, or Plan
       if (this.veriClaim.claimType === "GiveAction") {
         const giveUrl =
           this.apiServer +
           "/api/v2/report/gives?handleId=" +
           encodeURIComponent(this.veriClaim.handleId as string);
-        const giveHeaders = await serverUtil.getHeaders(userDid);
+        const giveHeaders = await this.getHeaders(identity);
         const giveResp = await this.axios.get(giveUrl, {
           headers: giveHeaders,
         });
@@ -632,7 +608,7 @@ export default class ClaimView extends Vue {
           this.apiServer +
           "/api/v2/report/offers?handleId=" +
           encodeURIComponent(this.veriClaim.handleId as string);
-        const offerHeaders = await serverUtil.getHeaders(userDid);
+        const offerHeaders = await this.getHeaders(identity);
         const offerResp = await this.axios.get(offerUrl, {
           headers: offerHeaders,
         });
@@ -648,14 +624,12 @@ export default class ClaimView extends Vue {
         this.apiServer +
         "/api/report/issuersWhoClaimedOrConfirmed?claimId=" +
         encodeURIComponent(serverUtil.stripEndorserPrefix(claimId));
-      const confirmHeaders = await serverUtil.getHeaders(userDid);
+      const confirmHeaders = await this.getHeaders(identity);
       const response = await this.axios.get(confirmUrl, {
         headers: confirmHeaders,
       });
       if (response.status === 200) {
         const resultList1 = response.data.result || [];
-        //const publicUrls = resultList.publicUrls || [];
-        delete resultList1.publicUrls;
         const resultList2 = R.reject(serverUtil.isHiddenDid, resultList1);
         const resultList3 = R.reject(
           (did: string) => did === this.veriClaim.issuer,
@@ -690,9 +664,15 @@ export default class ClaimView extends Vue {
   }
 
   async showFullClaim(claimId: string) {
+    await accountsDB.open();
+    const accounts = accountsDB.accounts;
+    const accountsArr: Account[] = await accounts?.toArray();
+    const account = accountsArr.find((acc) => acc.did === this.activeDid);
+    const identity = JSON.parse(account?.identity || "null");
+
     const url =
       this.apiServer + "/api/claim/full/" + encodeURIComponent(claimId);
-    const headers = await serverUtil.getHeaders(this.activeDid);
+    const headers = await this.getHeaders(identity);
 
     try {
       const resp = await this.axios.get(url, { headers });
@@ -737,65 +717,52 @@ export default class ClaimView extends Vue {
     }
   }
 
-  confirmConfirmClaim() {
-    this.$notify(
-      {
-        group: "modal",
-        type: "confirm",
-        title: "Confirm",
-        text: "Do you personally confirm that this is true?",
-        onYes: async () => {
-          await this.confirmClaim();
-        },
-      },
-      -1,
-    );
-  }
-
   // similar code is found in ProjectViewView
   async confirmClaim() {
-    // similar logic is found in endorser-mobile
-    const goodClaim = serverUtil.removeSchemaContext(
-      serverUtil.removeVisibleToDids(
-        serverUtil.addLastClaimOrHandleAsIdIfMissing(
-          this.veriClaim.claim,
-          this.veriClaim.id,
-          this.veriClaim.handleId,
+    if (confirm("Do you personally confirm that this is true?")) {
+      // similar logic is found in endorser-mobile
+      const goodClaim = serverUtil.removeSchemaContext(
+        serverUtil.removeVisibleToDids(
+          serverUtil.addLastClaimOrHandleAsIdIfMissing(
+            this.veriClaim.claim,
+            this.veriClaim.id,
+            this.veriClaim.handleId,
+          ),
         ),
-      ),
-    );
-    const confirmationClaim: serverUtil.GenericVerifiableCredential = {
-      "@context": "https://schema.org",
-      "@type": "AgreeAction",
-      object: goodClaim,
-    };
-    const result = await serverUtil.createAndSubmitClaim(
-      confirmationClaim,
-      this.activeDid,
-      this.apiServer,
-      this.axios,
-    );
-    if (result.type === "success") {
-      this.$notify(
-        {
-          group: "alert",
-          type: "success",
-          title: "Success",
-          text: "Confirmation submitted.",
-        },
-        5000,
       );
-    } else {
-      console.error("Got error submitting the confirmation:", result);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "There was a problem submitting the confirmation. See logs for more info.",
-        },
-        -1,
+      const confirmationClaim: serverUtil.GenericVerifiableCredential = {
+        "@context": "https://schema.org",
+        "@type": "AgreeAction",
+        object: goodClaim,
+      };
+      const result = await serverUtil.createAndSubmitClaim(
+        confirmationClaim,
+        await this.getIdentity(this.activeDid),
+        this.apiServer,
+        this.axios,
       );
+      if (result.type === "success") {
+        this.$notify(
+          {
+            group: "alert",
+            type: "success",
+            title: "Success",
+            text: "Confirmation submitted.",
+          },
+          5000,
+        );
+      } else {
+        console.error("Got error submitting the confirmation:", result);
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: "There was a problem submitting the confirmation. See logs for more info.",
+          },
+          -1,
+        );
+      }
     }
   }
 
@@ -803,23 +770,19 @@ export default class ClaimView extends Vue {
     const route = {
       path: "/claim/" + encodeURIComponent(claimId),
     };
-    (this.$router as Router).push(route).then(async () => {
+    this.$router.push(route).then(async () => {
       this.resetThisValues();
-      await this.loadClaim(claimId, this.activeDid);
+      await this.loadClaim(claimId, JSON.parse(this.accountIdentityStr));
     });
   }
 
   openFulfillGiftDialog() {
-    const giver: GiverReceiverInputInfo = {
-      did: libsUtil.offerGiverDid(
-        this.veriClaim as GenericCredWrapper<OfferVerifiableCredential>,
-      ),
+    const giver: GiverInputInfo = {
+      did: libsUtil.offerGiverDid(this.veriClaim),
     };
     (this.$refs.customGiveDialog as GiftedDialog).open(
       giver,
-      undefined,
       this.veriClaim.handleId,
-      "Offer fulfilled by " + (giver?.name || "someone not named"),
     );
   }
 
@@ -846,43 +809,5 @@ export default class ClaimView extends Vue {
       url: this.windowLocation,
     });
   }
-
-  onClickEditClaim() {
-    if (this.veriClaim.claimType === "GiveAction") {
-      const route = {
-        name: "gifted-details",
-        query: {
-          prevCredToEdit: JSON.stringify(this.veriClaim),
-          destinationPathAfter:
-            "/claim/" + encodeURIComponent(this.veriClaim.handleId),
-        },
-      };
-      (this.$router as Router).push(route);
-    } else if (this.veriClaim.claimType === "Offer") {
-      const route = {
-        name: "offer-details",
-        query: {
-          prevCredToEdit: JSON.stringify(this.veriClaim),
-          destinationPathAfter:
-            "/claim/" + encodeURIComponent(this.veriClaim.handleId),
-        },
-      };
-      (this.$router as Router).push(route);
-    } else {
-      console.error(
-        "Unrecognized claim type for edit:",
-        this.veriClaim.claimType,
-      );
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "This is an unrecognized claim type.",
-        },
-        3000,
-      );
-    }
-  }
 }
 </script>

src/views/ConfirmGiftView.vue

@@ -1,862 +0,0 @@
-<template>
-  <QuickNav />
-  <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
-    <!-- Breadcrumb -->
-    <div id="ViewBreadcrumb" class="mb-8">
-      <h1 class="text-lg text-center font-light relative px-7">
-        <!-- Back -->
-        <button
-          @click="$router.go(-1)"
-          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-        >
-          <fa icon="chevron-left" class="fa-fw" />
-        </button>
-        <span
-          v-if="
-            libsUtil.isGiveRecordTheUserCanConfirm(
-              isRegistered,
-              veriClaim,
-              activeDid,
-              confirmerIdList,
-            )
-          "
-        >
-          Do you agree?
-        </span>
-        <span v-else> Details </span>
-      </h1>
-    </div>
-
-    <div v-if="giveDetails && !isLoading">
-      <div class="flex justify-center">
-        <button
-          class="col-span-1 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"
-          v-if="
-            libsUtil.isGiveRecordTheUserCanConfirm(
-              isRegistered,
-              veriClaim,
-              activeDid,
-              confirmerIdList,
-            )
-          "
-          @click="confirmConfirmClaim()"
-        >
-          Confirm
-          <fa icon="circle-check" class="ml-2 text-white cursor-pointer" />
-        </button>
-        <button
-          v-else
-          @click="notifyWhyCannotConfirm()"
-          class="col-span-1 bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-4 py-2 rounded-md"
-        >
-          Confirm
-          <fa icon="circle-check" class="ml-2 text-white cursor-pointer" />
-        </button>
-        <a
-          v-if="isRegistered"
-          class="col-span-1 bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white ml-2 px-4 py-2 rounded-md"
-          :href="urlForNewGive"
-        >
-          Record a Similar One
-        </a>
-      </div>
-
-      <!-- Details -->
-      <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mt-4">
-        <div class="block flex gap-4 overflow-hidden">
-          <div class="overflow-hidden">
-            <div class="text-sm">
-              <div>
-                <fa icon="arrow-down" class="fa-fw text-slate-400" />
-                {{ giverName }}
-              </div>
-              <div class="ml-6">gave</div>
-              <div v-if="giveDetails.amount">
-                <fa icon="hand-holding-dollar" class="fa-fw text-slate-400" />
-                {{ displayAmount(giveDetails.unit, giveDetails.amount) }}
-              </div>
-              <div v-if="giveDetails.description">
-                <fa icon="message" class="fa-fw text-slate-400" />
-                {{ giveDetails.amount ? "and:" : "" }}
-                {{ giveDetails.description }}
-              </div>
-              <div class="ml-6">to</div>
-              <div>
-                <fa icon="arrow-up" class="fa-fw text-slate-400" />
-                {{ recipientName }}
-              </div>
-              <div>
-                <fa icon="calendar" class="fa-fw text-slate-400" />
-                on
-                {{ giveDetails.issuedAt.substring(0, 10) }}
-              </div>
-
-              <!-- Fullfills Links -->
-
-              <!-- fullfills links for a give -->
-              <div class="mt-2" v-if="giveDetails?.fulfillsPlanHandleId">
-                <router-link
-                  :to="
-                    '/project/' +
-                    encodeURIComponent(giveDetails?.fulfillsPlanHandleId)
-                  "
-                  class="text-blue-500 mt-2 cursor-pointer"
-                  target="_blank"
-                >
-                  This fulfills a bigger plan
-                  <fa icon="arrow-up-right-from-square" class="fa-fw" />
-                </router-link>
-              </div>
-              <!-- if there's another, it's probably fulfilling an offer, too -->
-              <div
-                v-if="
-                  giveDetails?.fulfillsType &&
-                  giveDetails?.fulfillsType !== 'PlanAction' &&
-                  giveDetails?.fulfillsHandleId
-                "
-              >
-                <!-- router-link to /claim/ only changes URL path -->
-                <router-link
-                  :to="
-                    '/claim/' +
-                    encodeURIComponent(giveDetails?.fulfillsHandleId)
-                  "
-                  class="text-blue-500 mt-2 cursor-pointer"
-                  target="_blank"
-                >
-                  This fulfills
-                  {{
-                    capitalizeAndInsertSpacesBeforeCapsWithAPrefix(
-                      giveDetails.fulfillsType,
-                    )
-                  }}
-                  <fa icon="arrow-up-right-from-square" class="fa-fw" />
-                </router-link>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="mt-2">
-        <fa icon="comment" class="text-slate-400" />
-        {{ issuerName }} posted that.
-      </div>
-
-      <div v-if="libsUtil.isGiveAction(veriClaim)" class="mt-4">
-        <h2 class="font-bold uppercase text-xl mt-8 mb-2">Confirmations</h2>
-
-        <span v-if="totalConfirmers() === 0">Nobody has confirmed this.</span>
-        <span v-else-if="totalConfirmers() === 1">
-          One person has confirmed this.
-        </span>
-        <span v-else>
-          {{ totalConfirmers() }} people have confirmed this.
-        </span>
-
-        <div v-if="totalConfirmers() > 0">
-          <div
-            v-if="
-              confirmerIdList.length === 0 && confsVisibleToIdList.length === 0
-            "
-          >
-            Nobody that you know confirmed this claim, nor do they have any
-            confirmers in their network.
-          </div>
-
-          <div
-            v-if="
-              confirmerIdList.length === 0 && confsVisibleToIdList.length > 0
-            "
-          >
-            <!-- Only show if this person has links to confirmers (below). -->
-            Nobody that you know has issued or confirmed this claim.
-          </div>
-          <div v-if="confirmerIdList.length > 0">
-            The following people have issued or confirmed this claim.
-            <ul class="ml-4">
-              <li
-                v-for="confirmerId in confirmerIdList"
-                :key="confirmerId"
-                class="list-disc ml-4"
-              >
-                <div class="flex gap-4">
-                  <div class="grow overflow-hidden">
-                    <div class="text-sm">
-                      {{ didInfo(confirmerId) }}
-                      <span v-if="!serverUtil.isEmptyOrHiddenDid(confirmerId)">
-                        <button
-                          @click="
-                            copyToClipboard(
-                              'The DID of ' + confirmerId,
-                              confirmerId,
-                            )
-                          "
-                        >
-                          <fa icon="copy" class="text-slate-400 fa-fw" />
-                        </button>
-                      </span>
-                    </div>
-                  </div>
-                </div>
-              </li>
-            </ul>
-          </div>
-
-          <!--
-           Never need to show this message:
-           "Nobody that you know can see someone who has confirmed this claim."
-
-           If there is nobody in the confirmerIdList then we'll show the combined "nobody" message.
-           If there is somebody in the confirmerIdList then that's all they need to show.
-           -->
-
-          <!-- Now show anyone linked to confirmers. -->
-          <div v-if="confsVisibleToIdList.length > 0">
-            The following people can connect you with people who have issued or
-            confirmed this claim.
-            <ul class="ml-4">
-              <li
-                v-for="confsVisibleTo in confsVisibleToIdList"
-                :key="confsVisibleTo"
-                class="list-disc ml-4"
-              >
-                <div class="flex gap-4">
-                  <div class="grow overflow-hidden">
-                    <div class="text-sm">
-                      {{ didInfo(confsVisibleTo) }}
-                      <span
-                        v-if="!serverUtil.isEmptyOrHiddenDid(confsVisibleTo)"
-                      >
-                        <button
-                          @click="
-                            copyToClipboard(
-                              'The DID of ' + confsVisibleTo,
-                              confsVisibleTo,
-                            )
-                          "
-                        >
-                          <fa icon="copy" class="text-slate-400 fa-fw" />
-                        </button>
-                      </span>
-                    </div>
-                  </div>
-                </div>
-              </li>
-            </ul>
-          </div>
-        </div>
-
-        <!-- explain if user cannot confirm -->
-        <!-- Note that these conditions are mirrored in userCanConfirm(). -->
-        <div v-if="confirmerIdList.includes(activeDid)">
-          You have confirmed this claim.
-        </div>
-        <div v-else-if="giveDetails.agentDid == activeDid">
-          You cannot confirm this because you issued this claim, so you already
-          count as confirming it.
-        </div>
-        <div v-else-if="serverUtil.containsHiddenDid(veriClaim.claim)">
-          You cannot confirm this because it contains hidden identifiers.
-        </div>
-      </div>
-
-      <h2
-        class="font-bold uppercase text-xl text-blue-500 mt-8 mb-2 cursor-pointer"
-        @click="showDetails = !showDetails"
-      >
-        {{ serverUtil.containsHiddenDid(veriClaim) ? "Visible " : "" }}Details
-        <span v-if="!showDetails"><fa icon="chevron-down" /></span>
-        <span v-else><fa icon="chevron-up" /></span>
-      </h2>
-      <div v-if="showDetails">
-        <div
-          v-if="
-            serverUtil.containsHiddenDid(veriClaim) &&
-            R.isEmpty(veriClaimDidsVisible)
-          "
-          class="mb-2"
-        >
-          Some of the details are not visible to you; they show as "HIDDEN".
-          They are not visible to any of your direct contacts, either.
-          <span v-if="canShare">
-            If you'd like to ask any of your contacts to take a look and see if
-            their contacts can see more details,
-            <a @click="onClickShareClaim()" class="text-blue-500"
-              >click to send them this info</a
-            >
-            and see if they are willing to make an introduction.
-          </span>
-          <span v-else>
-            If you'd like to ask any of your contacts to take a look and see if
-            their contacts can see more details,
-            <a
-              @click="copyToClipboard('Location', windowLocation.href)"
-              class="text-blue-500"
-              >share this page with them</a
-            >
-            and see if they are willing to make an introduction.
-          </span>
-        </div>
-
-        <div v-if="!R.isEmpty(veriClaimDidsVisible)">
-          Some of the details are not visible to you but they are visible to
-          some of your contacts.
-          <span v-if="canShare">
-            If you'd like an introduction,
-            <a @click="onClickShareClaim()" class="text-blue-500"
-              >click to share the information with them and ask if they'll tell
-              you more about the participants.</a
-            >
-          </span>
-          <span v-else>
-            If you'd like an introduction,
-            <a
-              @click="copyToClipboard('Location', windowLocation.href)"
-              class="text-blue-500"
-              >share this page with them and ask if they'll tell you more about
-              about the participants.</a
-            >
-          </span>
-
-          <div
-            v-for="(visibleDidPath, index) of Object.keys(veriClaimDidsVisible)"
-            :key="index"
-            class="list-disc p-4"
-          >
-            <div class="text-sm">
-              <fa icon="minus" class="fa-fw" />
-              The {{ visibleDidPath }} is visible to:
-            </div>
-            <div class="ml-12 p-1">
-              <ul>
-                <li
-                  v-for="(visDid, idx2) of veriClaimDidsVisible[visibleDidPath]"
-                  :key="idx2"
-                  class="list-disc"
-                >
-                  <div class="text-sm mt-2">
-                    <span>
-                      {{ didInfo(visDid) }}
-                      <span v-if="!serverUtil.isEmptyOrHiddenDid(visDid)">
-                        <button
-                          @click="
-                            copyToClipboard('The DID of ' + visDid, visDid)
-                          "
-                        >
-                          <fa icon="copy" class="text-slate-400 fa-fw" />
-                        </button>
-                      </span>
-                      <span v-if="veriClaim.publicUrls?.[visDid]"
-                        >, found at
-                        <fa icon="globe" class="fa-fw text-slate-400" />
-                        <a
-                          :href="veriClaim.publicUrls?.[visDid]"
-                          class="text-blue-500"
-                          >{{
-                            veriClaim.publicUrls[visDid].substring(
-                              veriClaim.publicUrls[visDid].indexOf("//") + 2,
-                            )
-                          }}
-                        </a>
-                      </span>
-                    </span>
-                  </div>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
-        <!-- Keep the dump contents directly between > and < to avoid weird spacing. -->
-        <pre
-          class="text-sm overflow-x-scroll px-4 py-3 bg-slate-100 rounded-md"
-          >{{ veriClaimDump }}</pre
-        >
-      </div>
-    </div>
-    <div v-else-if="!isLoading">This does not have details to confirm.</div>
-
-    <div class="mt-4" v-if="!isLoading">
-      <a
-        @click="showClaimPage(veriClaim.id)"
-        class="text-blue-500 cursor-pointer"
-      >
-        <fa icon="file-lines" class="pl-2" />
-        All Generic Info
-      </a>
-    </div>
-
-    <div
-      class="fixed left-6 bottom-24 text-center text-4xl leading-none bg-slate-400 text-white w-14 py-2.5 rounded-full"
-      v-if="isLoading"
-    >
-      <fa icon="spinner" class="fa-spin-pulse"></fa>
-    </div>
-  </section>
-</template>
-
-<script lang="ts">
-import { AxiosError } from "axios";
-import * as yaml from "js-yaml";
-import * as R from "ramda";
-import { Component, Vue } from "vue-facing-decorator";
-import { useClipboard } from "@vueuse/core";
-import { Router } from "vue-router";
-
-import QuickNav from "@/components/QuickNav.vue";
-import { NotificationIface } from "@/constants/app";
-import { accountsDB, db } from "@/db/index";
-import { Account } from "@/db/tables/accounts";
-import { Contact } from "@/db/tables/contacts";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
-import * as serverUtil from "@/libs/endorserServer";
-import { displayAmount } from "@/libs/endorserServer";
-import * as libsUtil from "@/libs/util";
-import { isGiveAction } from "@/libs/util";
-
-@Component({
-  methods: { displayAmount },
-  components: { QuickNav },
-})
-export default class ClaimView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-
-  activeDid = "";
-  allMyDids: Array<string> = [];
-  allContacts: Array<Contact> = [];
-  apiServer = "";
-
-  canShare = false;
-  confirmerIdList: string[] = []; // list of DIDs that have confirmed this claim excluding the issuer
-  confsVisibleErrorMessage = "";
-  confsVisibleToIdList: string[] = []; // list of DIDs that can see any confirmer
-  giveDetails = null;
-  giverName = "";
-  issuerName = "";
-  isLoading = false;
-  isRegistered = false;
-  numConfsNotVisible = 0; // number of hidden DIDs in the confirmerIdList, minus the issuer if they aren't visible
-  recipientName = "";
-  showDetails = false;
-  urlForNewGive = "";
-  veriClaim = serverUtil.BLANK_GENERIC_SERVER_RECORD;
-  veriClaimDump = "";
-  veriClaimDidsVisible = {};
-  windowLocation = window.location;
-
-  R = R;
-  yaml = yaml;
-  libsUtil = libsUtil;
-  serverUtil = serverUtil;
-
-  resetThisValues() {
-    this.confirmerIdList = [];
-    this.confsVisibleErrorMessage = "";
-    this.confsVisibleToIdList = [];
-    this.giveDetails = null;
-    this.isRegistered = false;
-    this.numConfsNotVisible = 0;
-    this.urlForNewGive = "";
-    this.veriClaim = serverUtil.BLANK_GENERIC_SERVER_RECORD;
-    this.veriClaimDump = "";
-  }
-
-  async mounted() {
-    this.isLoading = true;
-    await db.open();
-    const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
-    this.activeDid = settings?.activeDid || "";
-    this.apiServer = settings?.apiServer || "";
-    this.allContacts = await db.contacts.toArray();
-    this.isRegistered = settings?.isRegistered || false;
-
-    await accountsDB.open();
-    const accounts = accountsDB.accounts;
-    const accountsArr: Array<Account> = await accounts?.toArray();
-    this.allMyDids = accountsArr.map((acc) => acc.did);
-
-    const pathParam = window.location.pathname.substring(
-      "/confirm-gift/".length,
-    );
-    let claimId;
-    if (pathParam) {
-      claimId = decodeURIComponent(pathParam);
-      await this.loadClaim(claimId, this.activeDid);
-    } else {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "No claim ID was provided.",
-        },
-        3000,
-      );
-    }
-
-    // When Chrome compatibility is fixed https://developer.mozilla.org/en-US/docs/Web/API/Web_Share_API#api.navigator.canshare
-    // then use this truer check: navigator.canShare && navigator.canShare()
-    this.canShare = !!navigator.share;
-
-    this.isLoading = false;
-  }
-
-  // insert a space before any capital letters except the initial letter
-  // (and capitalize initial letter, just in case)
-  capitalizeAndInsertSpacesBeforeCaps(text: string) {
-    return !text
-      ? ""
-      : text[0].toUpperCase() + text.substr(1).replace(/([A-Z])/g, " $1");
-  }
-
-  capitalizeAndInsertSpacesBeforeCapsWithAPrefix(text: string) {
-    const word = this.capitalizeAndInsertSpacesBeforeCaps(text);
-    if (word) {
-      // if the word starts with a vowel, use "an" instead of "a"
-      const firstLetter = word[0].toLowerCase();
-      const vowels = ["a", "e", "i", "o", "u"];
-      const particle = vowels.includes(firstLetter) ? "an" : "a";
-      return particle + " " + word;
-    } else {
-      return "";
-    }
-  }
-
-  totalConfirmers() {
-    return (
-      this.numConfsNotVisible +
-      this.confirmerIdList.length +
-      this.confsVisibleToIdList.length
-    );
-  }
-
-  // Isn't there a better way to make this available to the template?
-  didInfo(did: string | undefined) {
-    return serverUtil.didInfo(
-      did,
-      this.activeDid,
-      this.allMyDids,
-      this.allContacts,
-    );
-  }
-
-  async loadClaim(claimId: string, userDid: string) {
-    const urlPath = libsUtil.isGlobalUri(claimId)
-      ? "/api/claim/byHandle/"
-      : "/api/claim/";
-    const url = this.apiServer + urlPath + encodeURIComponent(claimId);
-
-    try {
-      const headers = await serverUtil.getHeaders(userDid);
-      const resp = await this.axios.get(url, { headers });
-      // resp.data is:
-      // - a Jwt from https://api.endorser.ch/api-docs/
-      // - with a Give from https://endorser.ch/doc/html/transactions.html#id3
-      if (resp.status === 200) {
-        this.veriClaim = resp.data;
-        this.veriClaimDump = yaml.dump(this.veriClaim);
-        this.veriClaimDidsVisible = libsUtil.findAllVisibleToDids(
-          this.veriClaim,
-          true,
-        );
-      } else {
-        // actually, axios typically throws an error so we never get here
-        console.error("Error getting claim:", resp);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "There was a problem retrieving that claim.",
-          },
-          3000,
-        );
-        return;
-      }
-
-      // retrieve more details on Give, Offer, or Plan
-      if (this.veriClaim.claimType !== "GiveAction") {
-        // no need to go further... this page is for gifts
-        return;
-      }
-
-      this.issuerName = this.didInfo(this.veriClaim.issuer);
-
-      // use give record when possible since it may include edits
-      const giveUrl =
-        this.apiServer +
-        "/api/v2/report/gives?handleId=" +
-        encodeURIComponent(this.veriClaim.handleId as string);
-      const giveHeaders = await serverUtil.getHeaders(userDid);
-      const giveResp = await this.axios.get(giveUrl, {
-        headers: giveHeaders,
-      });
-      // giveResp.data is a Give from https://api.endorser.ch/api-docs/
-      if (giveResp.status === 200) {
-        this.giveDetails = giveResp.data.data[0];
-      } else {
-        console.error("Error getting detailed give info:", giveResp);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "Something went wrong retrieving gift data.",
-          },
-          3000,
-        );
-      }
-
-      this.urlForNewGive = "/gifted-details?";
-      if (this.giveDetails.amount) {
-        this.urlForNewGive +=
-          "&amountInput=" + encodeURIComponent(String(this.giveDetails.amount));
-      }
-      if (this.giveDetails.unit) {
-        this.urlForNewGive +=
-          "&unitCode=" + encodeURIComponent(this.giveDetails.unit);
-      }
-      if (this.giveDetails.description) {
-        this.urlForNewGive +=
-          "&description=" + encodeURIComponent(this.giveDetails.description);
-      }
-      this.giverName = this.didInfo(this.giveDetails.agentDid);
-      if (this.giveDetails.agentDid) {
-        this.urlForNewGive +=
-          "&giverDid=" +
-          encodeURIComponent(this.giveDetails.agentDid) +
-          "&giverName=" +
-          encodeURIComponent(this.giverName);
-      }
-      this.recipientName = this.didInfo(this.giveDetails.recipientDid);
-      if (this.giveDetails.recipientDid) {
-        this.urlForNewGive +=
-          "&recipientDid=" +
-          encodeURIComponent(this.giveDetails.recipientDid) +
-          "&recipientName=" +
-          encodeURIComponent(this.recipientName);
-      }
-      if (this.giveDetails.fullClaim.image) {
-        this.urlForNewGive +=
-          "&image=" + encodeURIComponent(this.giveDetails.fullClaim.image);
-      }
-      if (
-        this.giveDetails.type == "Offer" &&
-        this.giveDetails.fulfillsHandleId
-      ) {
-        this.urlForNewGive +=
-          "&offerId=" + encodeURIComponent(this.giveDetails.fulfillsHandleId);
-      }
-      if (this.giveDetails.fulfillsPlanHandleId) {
-        this.urlForNewGive +=
-          "&projectId=" +
-          encodeURIComponent(this.giveDetails.fulfillsPlanHandleId);
-      }
-
-      // retrieve the list of confirmers
-      const confirmUrl =
-        this.apiServer +
-        "/api/report/issuersWhoClaimedOrConfirmed?claimId=" +
-        encodeURIComponent(serverUtil.stripEndorserPrefix(claimId));
-      const confirmHeaders = await serverUtil.getHeaders(userDid);
-      const response = await this.axios.get(confirmUrl, {
-        headers: confirmHeaders,
-      });
-      if (response.status === 200) {
-        const resultList1 = response.data.result || [];
-        //const publicUrls = resultList.publicUrls || [];
-        delete resultList1.publicUrls;
-        const resultList2 = R.reject(serverUtil.isHiddenDid, resultList1);
-        const resultList3 = R.reject(
-          (did: string) => did === this.giveDetails.agentDid,
-          resultList2,
-        );
-        this.confirmerIdList = resultList3;
-        this.numConfsNotVisible = resultList1.length - resultList2.length;
-        if (resultList3.length === resultList2.length) {
-          // the issuer was not in the "visible" list so they must be hidden
-          // so subtract them from the non-visible confirmers count
-          this.numConfsNotVisible = this.numConfsNotVisible - 1;
-        }
-        this.confsVisibleToIdList =
-          response.data.result.resultVisibleToDids || [];
-      } else {
-        this.confsVisibleErrorMessage =
-          "Had problems retrieving confirmations.";
-      }
-    } catch (error: unknown) {
-      const serverError = error as AxiosError;
-      console.error("Error retrieving claim:", serverError);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "Something went wrong retrieving claim data.",
-        },
-        3000,
-      );
-    }
-  }
-
-  confirmConfirmClaim() {
-    this.$notify(
-      {
-        group: "modal",
-        type: "confirm",
-        title: "Confirm",
-        text: "Do you personally confirm that this is true?",
-        onYes: async () => {
-          await this.confirmClaim();
-        },
-      },
-      -1,
-    );
-  }
-
-  // similar code is found in ProjectViewView
-  async confirmClaim() {
-    // similar logic is found in endorser-mobile
-    const goodClaim = serverUtil.removeSchemaContext(
-      serverUtil.removeVisibleToDids(
-        serverUtil.addLastClaimOrHandleAsIdIfMissing(
-          this.veriClaim.claim,
-          this.veriClaim.id,
-          this.veriClaim.handleId,
-        ),
-      ),
-    );
-    const confirmationClaim: serverUtil.GenericVerifiableCredential = {
-      "@context": "https://schema.org",
-      "@type": "AgreeAction",
-      object: goodClaim,
-    };
-    const result = await serverUtil.createAndSubmitClaim(
-      confirmationClaim,
-      this.activeDid,
-      this.apiServer,
-      this.axios,
-    );
-    if (result.type === "success") {
-      this.$notify(
-        {
-          group: "alert",
-          type: "success",
-          title: "Success",
-          text: "Confirmation submitted.",
-        },
-        3000,
-      );
-    } else {
-      console.error("Got error submitting the confirmation:", result);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "There was a problem submitting the confirmation. See logs for more info.",
-        },
-        5000,
-      );
-    }
-  }
-
-  showClaimPage(claimId: string) {
-    const route = {
-      path: "/claim/" + encodeURIComponent(claimId),
-    };
-    (this.$router as Router).push(route).then(async () => {
-      this.resetThisValues();
-      await this.loadClaim(claimId, this.activeDid);
-    });
-  }
-
-  copyToClipboard(name: string, text: string) {
-    useClipboard()
-      .copy(text)
-      .then(() => {
-        this.$notify(
-          {
-            group: "alert",
-            type: "toast",
-            title: "Copied",
-            text: (name || "That") + " was copied to the clipboard.",
-          },
-          2000,
-        );
-      });
-  }
-
-  notifyWhyCannotConfirm() {
-    if (!this.isRegistered) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "info",
-          title: "Not Registered",
-          text: "Someone needs to register you before you can contribute.",
-        },
-        3000,
-      );
-    } else if (!isGiveAction(this.veriClaim)) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "info",
-          title: "Not A Give",
-          text: "This is not a giving action to confirm.",
-        },
-        3000,
-      );
-    } else if (this.confirmerIdList.includes(this.activeDid)) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "info",
-          title: "Already Confirmed",
-          text: "You have already confirmed this claim.",
-        },
-        3000,
-      );
-    } else if (this.giveDetails.agentDid == this.activeDid) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "info",
-          title: "Cannot Confirm",
-          text: "You cannot confirm this because you issued this claim.",
-        },
-        3000,
-      );
-    } else if (serverUtil.containsHiddenDid(this.giveDetails.fullClaim)) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "info",
-          title: "Cannot Confirm",
-          text: "You cannot confirm this because it contains hidden identifiers.",
-        },
-        3000,
-      );
-    } else {
-      this.$notify(
-        {
-          group: "alert",
-          type: "info",
-          title: "Cannot Confirm",
-          text: "You cannot confirm this claim.",
-        },
-        3000,
-      );
-    }
-  }
-
-  onClickShareClaim() {
-    window.navigator.share({
-      title: "Help Connect Me",
-      text: "I'm trying to find the full details of this claim. Can you help me?",
-      url: this.windowLocation.href,
-    });
-  }
-}
-</script>

src/views/ContactAmountsView.vue

@@ -55,9 +55,9 @@
             {{ new Date(record.issuedAt).toLocaleString() }}
           </td>
           <td class="p-1">
-            <span v-if="record.agentDid == contact?.did">
+            <span v-if="record.agentDid == contact.did">
               <div class="font-bold">
-                {{ displayAmount(record.unit, record.amount) }}
+                {{ record.amount }} {{ record.unit }}
                 <span v-if="record.amountConfirmed" title="Confirmed">
                   <fa icon="circle-check" class="text-green-600 fa-fw" />
                 </span>
@@ -71,7 +71,7 @@
             </span>
           </td>
           <td class="p-1">
-            <span v-if="record.agentDid == contact?.did">
+            <span v-if="record.agentDid == contact.did">
               <fa icon="arrow-left" class="text-slate-400 fa-fw" />
             </span>
             <span v-else>
@@ -79,9 +79,9 @@
             </span>
           </td>
           <td class="p-1">
-            <span v-if="record.agentDid != contact?.did">
+            <span v-if="record.agentDid != contact.did">
               <div class="font-bold">
-                {{ displayAmount(record.unit, record.amount) }}
+                {{ record.amount }} {{ record.unit }}
                 <span v-if="record.amountConfirmed" title="Confirmed">
                   <fa icon="circle-check" class="text-green-600 fa-fw" />
                 </span>
@@ -105,21 +105,20 @@
 </template>
 
 <script lang="ts">
-import { AxiosError, AxiosRequestHeaders } from "axios";
+import { AxiosError } from "axios";
+import * as didJwt from "did-jwt";
 import * as R from "ramda";
+import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import QuickNav from "@/components/QuickNav.vue";
 import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import { accessToken, SimpleSigner } from "@/libs/crypto";
 import {
   AgreeVerifiableCredential,
-  createEndorserJwtVcFromClaim,
-  displayAmount,
-  getHeaders,
   GiveSummaryRecord,
   GiveVerifiableCredential,
   SCHEMA_ORG_CONTEXT,
@@ -135,22 +134,45 @@ export default class ContactAmountssView extends Vue {
   giveRecords: Array<GiveSummaryRecord> = [];
   numAccounts = 0;
 
-  displayAmount = displayAmount;
-
   async beforeCreate() {
     await accountsDB.open();
     this.numAccounts = await accountsDB.accounts.count();
   }
 
+  public async getIdentity(activeDid: string) {
+    await accountsDB.open();
+    const account = await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first();
+    const identity = JSON.parse(account?.identity || "null");
+
+    if (!identity) {
+      throw new Error(
+        "Attempted to load Give records with no identifier available.",
+      );
+    }
+    return identity;
+  }
+
+  public async getHeaders(identity: IIdentifier) {
+    const token = await accessToken(identity);
+    const headers = {
+      "Content-Type": "application/json",
+      Authorization: "Bearer " + token,
+    };
+    return headers;
+  }
+
   async created() {
     try {
       await db.open();
-      const contactDid = (this.$route as Router).query["contactDid"] as string;
+      const contactDid = this.$route.query.contactDid as string;
       this.contact = (await db.contacts.get(contactDid)) || null;
 
       const settings = await db.settings.get(MASTER_SETTINGS_KEY);
-      this.activeDid = (settings?.activeDid as string) || "";
-      this.apiServer = (settings?.apiServer as string) || "";
+      this.activeDid = settings?.activeDid || "";
+      this.apiServer = settings?.apiServer || "";
 
       if (this.activeDid && this.contact) {
         this.loadGives(this.activeDid, this.contact);
@@ -174,14 +196,15 @@ export default class ContactAmountssView extends Vue {
 
   async loadGives(activeDid: string, contact: Contact) {
     try {
+      const identity = await this.getIdentity(this.activeDid);
       let result: Array<GiveSummaryRecord> = [];
       const url =
         this.apiServer +
         "/api/v2/report/gives?agentDid=" +
-        encodeURIComponent(this.activeDid) +
+        encodeURIComponent(identity.did) +
         "&recipientDid=" +
         encodeURIComponent(contact.did);
-      const headers = await getHeaders(activeDid);
+      const headers = await this.getHeaders(identity);
       const resp = await this.axios.get(url, { headers });
       if (resp.status === 200) {
         result = resp.data.data;
@@ -207,8 +230,8 @@ export default class ContactAmountssView extends Vue {
         "/api/v2/report/gives?agentDid=" +
         encodeURIComponent(contact.did) +
         "&recipientDid=" +
-        encodeURIComponent(this.activeDid);
-      const headers2 = await getHeaders(activeDid);
+        encodeURIComponent(identity.did);
+      const headers2 = await this.getHeaders(identity);
       const resp2 = await this.axios.get(url2, { headers: headers2 });
       if (resp2.status === 200) {
         result = R.concat(result, resp2.data.data);
@@ -263,44 +286,66 @@ export default class ContactAmountssView extends Vue {
       object: origClaim,
     };
 
-    const vcJwt: string = await createEndorserJwtVcFromClaim(
-      this.activeDid,
-      vcClaim,
-    );
+    // Make a payload for the claim
+    const vcPayload = {
+      vc: {
+        "@context": ["https://www.w3.org/2018/credentials/v1"],
+        type: ["VerifiableCredential"],
+        credentialSubject: vcClaim,
+      },
+    };
 
-    // Make the xhr request payload
-    const payload = JSON.stringify({ jwtEncoded: vcJwt });
-    const url = this.apiServer + "/api/v2/claim";
-    const headers = (await getHeaders(this.activeDid)) as AxiosRequestHeaders;
+    // Create a signature using private key of identity
+    const identity = await this.getIdentity(this.activeDid);
+    if (identity.keys[0].privateKeyHex !== null) {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const privateKeyHex: string = identity.keys[0].privateKeyHex!;
+      const signer = await SimpleSigner(privateKeyHex);
+      const alg = undefined;
+      // Create a JWT for the request
+      const vcJwt: string = await didJwt.createJWT(vcPayload, {
+        alg: alg,
+        issuer: identity.did,
+        signer: signer,
+      });
 
-    try {
-      const resp = await this.axios.post(url, payload, { headers });
-      if (resp.data?.success) {
-        record.amountConfirmed =
-          (origClaim.object?.amountOfThisGood as number) || 1;
-      }
-    } catch (error) {
-      let userMessage = "There was an error. See logs for more info.";
-      const serverError = error as AxiosError;
-      if (serverError) {
-        if (serverError.message) {
-          userMessage = serverError.message; // Info for the user
-        } else {
-          userMessage = JSON.stringify(serverError.toJSON());
+      // Make the xhr request payload
+      const payload = JSON.stringify({ jwtEncoded: vcJwt });
+      const url = this.apiServer + "/api/v2/claim";
+      const token = await accessToken(identity);
+      const headers = {
+        "Content-Type": "application/json",
+        Authorization: "Bearer " + token,
+      };
+
+      try {
+        const resp = await this.axios.post(url, payload, { headers });
+        if (resp.data?.success) {
+          record.amountConfirmed = origClaim.object?.amountOfThisGood || 1;
         }
-      } else {
-        userMessage = error as string;
+      } catch (error) {
+        let userMessage = "There was an error. See logs for more info.";
+        const serverError = error as AxiosError;
+        if (serverError) {
+          if (serverError.message) {
+            userMessage = serverError.message; // Info for the user
+          } else {
+            userMessage = JSON.stringify(serverError.toJSON());
+          }
+        } else {
+          userMessage = error as string;
+        }
+        // Now set that error for the user to see.
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error With Server",
+            text: userMessage,
+          },
+          -1,
+        );
       }
-      // Now set that error for the user to see.
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error With Server",
-          text: userMessage,
-        },
-        -1,
-      );
     }
   }
 

src/views/ContactGiftingView.vue

@@ -26,7 +26,7 @@
               width="32"
               class="inline-block align-middle border border-slate-300 rounded-md mr-1"
             />
-            Unnamed/Unknown
+            Anonymous/Unnamed
           </span>
           <span class="text-right">
             <button
@@ -47,7 +47,7 @@
         <h2 class="text-base flex gap-4 items-center">
           <span class="grow font-semibold">
             <EntityIcon
-              :contact="contact"
+              :entityId="contact.did"
               :iconSize="32"
               class="inline-block align-middle border border-slate-300 rounded-md mr-1"
             />
@@ -66,21 +66,28 @@
       </li>
     </ul>
 
-    <GiftedDialog ref="customDialog" :projectId="projectId" />
+    <GiftedDialog
+      ref="customDialog"
+      message="Received from"
+      :projectId="projectId"
+    />
   </section>
 </template>
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
+import { IIdentifier } from "@veramo/core";
 
 import GiftedDialog from "@/components/GiftedDialog.vue";
 import QuickNav from "@/components/QuickNav.vue";
 import EntityIcon from "@/components/EntityIcon.vue";
 import { NotificationIface } from "@/constants/app";
-import { db } from "@/db/index";
+import { db, accountsDB } from "@/db/index";
+import { Account, AccountsSchema } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
-import { GiverReceiverInputInfo } from "@/libs/endorserServer";
+import { accessToken } from "@/libs/crypto";
+import { GiverInputInfo } from "@/libs/endorserServer";
 
 @Component({
   components: { GiftedDialog, QuickNav, EntityIcon },
@@ -91,21 +98,22 @@ export default class ContactGiftingView extends Vue {
   activeDid = "";
   allContacts: Array<Contact> = [];
   apiServer = "";
+  accounts: typeof AccountsSchema;
+  numAccounts = 0;
   projectId = localStorage.getItem("projectId") || "";
 
+  async beforeCreate() {
+    accountsDB.open();
+    this.numAccounts = await accountsDB.accounts.count();
+  }
+
   async created() {
     try {
       await db.open();
       const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
       this.apiServer = settings?.apiServer || "";
       this.activeDid = settings?.activeDid || "";
-
-      // .orderBy("name") wouldn't retrieve any entries with a blank name
-      // .toCollection.sortBy("name") didn't sort in an order I understood
-      const baseContacts = await db.contacts.toArray();
-      this.allContacts = baseContacts.sort((a, b) =>
-        (a.name || "").localeCompare(b.name || ""),
-      );
+      this.allContacts = await db.contacts.orderBy("name").toArray();
 
       localStorage.removeItem("projectId");
 
@@ -126,16 +134,33 @@ export default class ContactGiftingView extends Vue {
     }
   }
 
-  openDialog(giver?: GiverReceiverInputInfo) {
-    const recipient = this.projectId
-      ? undefined
-      : { did: this.activeDid, name: "you" };
-    (this.$refs.customDialog as GiftedDialog).open(
-      giver,
-      recipient,
-      undefined,
-      "Given by " + (giver?.name || "someone not named"),
-    );
+  public async getIdentity(activeDid: string) {
+    await accountsDB.open();
+    const account = (await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first()) as Account;
+    const identity = JSON.parse(account?.identity || "null");
+
+    if (!identity) {
+      throw new Error(
+        "Attempted to load Give records with no identifier available.",
+      );
+    }
+    return identity;
+  }
+
+  public async getHeaders(identity: IIdentifier) {
+    const token = await accessToken(identity);
+    const headers = {
+      "Content-Type": "application/json",
+      Authorization: "Bearer " + token,
+    };
+    return headers;
+  }
+
+  openDialog(giver: GiverInputInfo) {
+    (this.$refs.customDialog as GiftedDialog).open(giver);
   }
 }
 </script>

src/views/ContactImportView.vue

@@ -1,190 +0,0 @@
-<template>
-  <QuickNav selected="Contacts"></QuickNav>
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
-    <!-- Back -->
-    <div class="text-lg text-center font-light relative px-7">
-      <h1
-        class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-        @click="$router.back()"
-      >
-        <fa icon="chevron-left" class="fa-fw"></fa>
-      </h1>
-    </div>
-
-    <!-- Heading -->
-    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
-      Contact Import
-    </h1>
-
-    <span>
-      Note that you will have to make them visible one-by-one in the list of
-      Contacts.
-    </span>
-    <div v-if="sameCount > 0">
-      {{ sameCount }} contact{{ sameCount == 1 ? "" : "s" }} are the same as
-      existing contacts.
-    </div>
-
-    <!-- Results List -->
-    <ul v-if="contactsImporting.length > 0" class="border-t border-slate-300">
-      <li v-for="(contact, index) in contactsImporting" :key="contact.did">
-        <div
-          v-if="
-            !contactsExisting[contact.did] ||
-            !R.isEmpty(contactDifferences[contact.did])
-          "
-          class="grow overflow-hidden border-b border-slate-300 pt-2.5 pb-4"
-        >
-          <h2 class="text-base font-semibold">
-            <input type="checkbox" v-model="contactsSelected[index]" />
-            {{ contact.name || AppString.NO_CONTACT_NAME }}
-            -
-            <span v-if="contactsExisting[contact.did]" class="text-orange-500"
-              >Existing</span
-            >
-            <span v-else class="text-green-500">New</span>
-          </h2>
-          <div class="text-sm truncate">
-            {{ contact.did }}
-          </div>
-          <div v-if="contactDifferences[contact.did]">
-            <div>
-              <div class="grid grid-cols-3 gap-2">
-                <div class="font-bold">Field</div>
-                <div class="font-bold">Old Value</div>
-                <div class="font-bold">New Value</div>
-              </div>
-              <div
-                v-for="(value, contactField) in contactDifferences[contact.did]"
-                :key="contactField"
-                class="grid grid-cols-3 border"
-              >
-                <div class="border p-1">{{ contactField }}</div>
-                <div class="border p-1">{{ value.old }}</div>
-                <div class="border p-1">{{ value.new }}</div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </li>
-      <fa icon="spinner" v-if="importing" class="animate-spin" />
-      <button
-        v-else
-        class="bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-sm text-white mt-2 px-2 py-1.5 rounded"
-        @click="importContacts"
-      >
-        Import Selected Contacts
-      </button>
-    </ul>
-    <p v-else>There are no contacts to import.</p>
-  </section>
-</template>
-
-<script lang="ts">
-import * as R from "ramda";
-import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
-
-import { AppString, NotificationIface } from "@/constants/app";
-import { db } from "@/db/index";
-import { Contact } from "@/db/tables/contacts";
-import * as libsUtil from "@/libs/util";
-import QuickNav from "@/components/QuickNav.vue";
-import EntityIcon from "@/components/EntityIcon.vue";
-import OfferDialog from "@/components/OfferDialog.vue";
-
-@Component({
-  components: { EntityIcon, OfferDialog, QuickNav },
-})
-export default class ContactImportView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-
-  AppString = AppString;
-  libsUtil = libsUtil;
-  R = R;
-
-  contactsExisting: Record<string, Contact> = {}; // user's contacts already in the system, keyed by DID
-  contactsImporting: Array<Contact> = []; // contacts from the import
-  contactsSelected: Array<boolean> = []; // whether each contact in contactsImporting is selected
-  contactDifferences: Record<
-    string,
-    Record<string, { new: string; old: string }>
-  > = {}; // for existing contacts, it shows the difference between imported and existing contacts for each key
-  importing = false;
-  sameCount = 0;
-
-  async created() {
-    // Retrieve the imported contacts from the query parameter
-    const importedContacts =
-      ((this.$route as Router).query["contacts"] as string) || "[]";
-    this.contactsImporting = JSON.parse(importedContacts);
-    this.contactsSelected = new Array(this.contactsImporting.length).fill(
-      false,
-    );
-
-    await db.open();
-    const baseContacts = await db.contacts.toArray();
-    // set the existing contacts, keyed by DID, if they exist in contactsImporting
-    for (let i = 0; i < this.contactsImporting.length; i++) {
-      const contactIn = this.contactsImporting[i];
-      const existingContact = baseContacts.find(
-        (contact) => contact.did === contactIn.did,
-      );
-      if (existingContact) {
-        this.contactsExisting[contactIn.did] = existingContact;
-
-        const differences: Record<string, { new: string; old: string }> = {};
-        Object.keys(contactIn).forEach((key) => {
-          if (contactIn[key] !== existingContact[key]) {
-            differences[key] = {
-              old: existingContact[key],
-              new: contactIn[key],
-            };
-          }
-        });
-        this.contactDifferences[contactIn.did] = differences;
-        if (R.isEmpty(differences)) {
-          this.sameCount++;
-        }
-      } else {
-        // automatically import new data
-        this.contactsSelected[i] = true;
-      }
-    }
-  }
-
-  async importContacts() {
-    this.importing = true;
-    let importedCount = 0,
-      updatedCount = 0;
-    for (let i = 0; i < this.contactsImporting.length; i++) {
-      if (this.contactsSelected[i]) {
-        const contact = this.contactsImporting[i];
-        const existingContact = this.contactsExisting[contact.did];
-        if (existingContact) {
-          await db.contacts.update(contact.did, contact);
-          updatedCount++;
-        } else {
-          // without explicit clone on the Proxy, we get: DataCloneError: Failed to execute 'add' on 'IDBObjectStore': #<Object> could not be cloned.
-          await db.contacts.add(R.clone(contact));
-          importedCount++;
-        }
-      }
-    }
-    this.importing = false;
-
-    this.$notify(
-      {
-        group: "alert",
-        type: "success",
-        title: "Import Success",
-        text:
-          `${importedCount} contact${importedCount == 1 ? "" : "s"} imported.` +
-          (updatedCount ? ` ${updatedCount} updated.` : ""),
-      },
-      3000,
-    );
-    (this.$router as Router).push({ name: "contacts" });
-  }
-}
-</script>

src/views/ContactQRScanShowView.vue

@@ -24,7 +24,6 @@
       >
         <span class="text-red">Beware!</span>
         You aren't sharing your name, so quickly
-        <br />
         <router-link
           :to="{ name: 'new-edit-account' }"
           class="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-1 rounded-md"
@@ -34,11 +33,7 @@
       </p>
     </div>
 
-    <div
-      @click="onCopyUrlToClipboard()"
-      v-if="activeDid && activeDid.startsWith(ETHR_DID_PREFIX)"
-      class="text-center"
-    >
+    <div @click="onCopyToClipboard()" v-if="activeDid" class="text-center">
       <!--
         Play with display options: https://qr-code-styling.com/
         See docs: https://www.npmjs.com/package/qr-code-generator-vue3
@@ -49,18 +44,7 @@
         :dotsOptions="{ type: 'square' }"
         class="flex justify-center"
       />
-      <span>
-        Click this or QR code to copy your contact URL to your clipboard.
-      </span>
-    </div>
-    <div v-else-if="activeDid" class="text-center">
-      <!-- Not an ETHR DID so force them to paste it. (Passkey Peer DIDs are too big.) -->
-      <span @click="onCopyDidToClipboard()" class="text-blue-500">
-        Click here to copy your DID to your clipboard.
-      </span>
-      <span>
-        Then give it to them so they can paste it in their list of People.
-      </span>
+      <span> Click QR to copy your contact URL to your clipboard. </span>
     </div>
     <div class="text-center" v-else>
       You have no identitifiers yet, so
@@ -86,8 +70,7 @@
 </template>
 
 <script lang="ts">
-import { AxiosError } from "axios";
-import { Buffer } from "buffer/";
+import * as didJwt from "did-jwt";
 import { sha256 } from "ethereum-cryptography/sha256.js";
 import QRCodeVue3 from "qr-code-generator-vue3";
 import * as R from "ramda";
@@ -95,25 +78,17 @@ import { Component, Vue } from "vue-facing-decorator";
 import { QrcodeStream } from "vue-qrcode-reader";
 import { useClipboard } from "@vueuse/core";
 
-import QuickNav from "@/components/QuickNav.vue";
 import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
-import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import {
-  deriveAddress,
-  getContactPayloadFromJwtUrl,
-  nextDerivationPath,
-} from "@/libs/crypto";
+import { deriveAddress, nextDerivationPath, SimpleSigner } from "@/libs/crypto";
+import QuickNav from "@/components/QuickNav.vue";
+import { Account } from "@/db/tables/accounts";
 import {
   CONTACT_URL_PREFIX,
-  createEndorserJwtForDid,
   ENDORSER_JWT_URL_LOCATION,
-  isDid,
-  register,
-  setVisibilityUtil,
 } from "@/libs/endorserServer";
-import { ETHR_DID_PREFIX } from "@/libs/crypto/vc";
+import { Buffer } from "buffer/";
 
 @Component({
   components: {
@@ -128,29 +103,47 @@ export default class ContactQRScanShow extends Vue {
   activeDid = "";
   apiServer = "";
   givenName = "";
-  hideRegisterPromptOnNewContact = false;
-  isRegistered = false;
   qrValue = "";
 
-  ETHR_DID_PREFIX = ETHR_DID_PREFIX;
+  public async getIdentity(activeDid: string) {
+    await accountsDB.open();
+    const accounts = await accountsDB.accounts.toArray();
+    const account: Account | undefined = R.find(
+      (acc) => acc.did === activeDid,
+      accounts,
+    );
+    const identity = JSON.parse(account?.identity || "null");
+
+    if (!identity) {
+      throw new Error(
+        "Attempted to show contact info with no identifier available.",
+      );
+    }
+    return identity;
+  }
 
   async created() {
     await db.open();
     const settings = await db.settings.get(MASTER_SETTINGS_KEY);
-    this.activeDid = (settings?.activeDid as string) || "";
-    this.apiServer = (settings?.apiServer as string) || "";
-    this.givenName = (settings?.firstName as string) || "";
-    this.hideRegisterPromptOnNewContact =
-      !!settings?.hideRegisterPromptOnNewContact;
-    this.isRegistered = !!settings?.isRegistered;
+    this.activeDid = settings?.activeDid || "";
+    this.apiServer = settings?.apiServer || "";
+    this.givenName = settings?.firstName || "";
 
     await accountsDB.open();
     const accounts = await accountsDB.accounts.toArray();
     const account = R.find((acc) => acc.did === this.activeDid, accounts);
     if (account) {
-      const publicKeyHex = account.publicKeyHex;
+      const identity = await this.getIdentity(this.activeDid);
+      const publicKeyHex = identity.keys[0].publicKeyHex;
       const publicEncKey = Buffer.from(publicKeyHex, "hex").toString("base64");
 
+      const newDerivPath = nextDerivationPath(account.derivationPath);
+      const nextPublicHex = deriveAddress(account.mnemonic, newDerivPath)[2];
+      const nextPublicEncKey = Buffer.from(nextPublicHex, "hex");
+      const nextPublicEncKeyHash = sha256(nextPublicEncKey);
+      const nextPublicEncKeyHashBase64 =
+        Buffer.from(nextPublicEncKeyHash).toString("base64");
+
       const contactInfo = {
         iat: Date.now(),
         iss: this.activeDid,
@@ -159,259 +152,43 @@ export default class ContactQRScanShow extends Vue {
             (settings?.firstName || "") +
             (settings?.lastName ? ` ${settings.lastName}` : ""), // deprecated, pre v 0.1.3
           publicEncKey,
-          profileImageUrl: settings?.profileImageUrl,
-          registered: settings?.isRegistered,
+          nextPublicEncKeyHash: nextPublicEncKeyHashBase64,
         },
       };
 
-      if (account?.mnemonic && account?.derivationPath) {
-        const newDerivPath = nextDerivationPath(
-          account.derivationPath as string,
-        );
-        const nextPublicHex = deriveAddress(
-          account.mnemonic as string,
-          newDerivPath,
-        )[2];
-        const nextPublicEncKey = Buffer.from(nextPublicHex, "hex");
-        const nextPublicEncKeyHash = sha256(nextPublicEncKey);
-        const nextPublicEncKeyHashBase64 =
-          Buffer.from(nextPublicEncKeyHash).toString("base64");
-        contactInfo.own.nextPublicEncKeyHash = nextPublicEncKeyHashBase64;
-      }
-
-      const vcJwt = await createEndorserJwtForDid(this.activeDid, contactInfo);
-
+      const alg = undefined;
+      const privateKeyHex: string = identity.keys[0].privateKeyHex;
+      const signer = await SimpleSigner(privateKeyHex);
+      // create a JWT for the request
+      const vcJwt: string = await didJwt.createJWT(contactInfo, {
+        alg: alg,
+        issuer: identity.did,
+        signer: signer,
+      });
       const viewPrefix = CONTACT_URL_PREFIX + ENDORSER_JWT_URL_LOCATION;
       this.qrValue = viewPrefix + vcJwt;
     }
   }
 
-  danger(message: string, title: string = "Error", timeout = 5000) {
-    this.$notify(
-      {
-        group: "alert",
-        type: "danger",
-        title: title,
-        text: message,
-      },
-      timeout,
-    );
-  }
-
   /**
    *
    * @param content is the result of a QR scan, an array with one item with a rawValue property
    */
   // Unfortunately, there are not typescript definitions for the qrcode-stream component yet.
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  async onScanDetect(content: any) {
-    const url = content[0]?.rawValue;
-    if (url) {
-      let newContact: Contact;
-      try {
-        const payload = getContactPayloadFromJwtUrl(url);
-        if (!payload) {
-          this.$notify(
-            {
-              group: "alert",
-              type: "danger",
-              title: "No Contact Info",
-              text: "The contact info could not be parsed.",
-            },
-            3000,
-          );
-          return;
-        }
-        newContact = {
-          did: payload.iss as string,
-          name: payload.own.name,
-          nextPubKeyHashB64: payload.own.nextPublicEncKeyHash,
-          profileImageUrl: payload.own.profileImageUrl,
-          publicKeyBase64: payload.own.publicEncKey,
-          registered: payload.own.registered,
-        };
-        if (!newContact.did) {
-          this.danger("There is no DID.", "Incomplete Contact");
-          return;
-        }
-        if (!isDid(newContact.did)) {
-          this.danger("The DID must begin with 'did:'", "Invalid DID");
-          return;
-        }
-      } catch (e) {
-        console.error("Error parsing QR info:", e);
-        this.danger("Could not parse the QR info.", "Read Error");
-        return;
-      }
-
-      try {
-        await db.open();
-        await db.contacts.add(newContact);
-
-        let addedMessage;
-        if (this.activeDid) {
-          await this.setVisibility(newContact, true);
-          newContact.seesMe = true; // didn't work inside setVisibility
-          addedMessage =
-            "They were added, and your activity is visible to them.";
-        } else {
-          addedMessage = "They were added.";
-        }
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Contact Added",
-            text: addedMessage,
-          },
-          3000,
-        );
-
-        if (this.isRegistered) {
-          if (!this.hideRegisterPromptOnNewContact && !newContact.registered) {
-            setTimeout(() => {
-              this.$notify(
-                {
-                  group: "modal",
-                  type: "confirm",
-                  title: "Register",
-                  text: "Do you want to register them?",
-                  onCancel: async (stopAsking: boolean) => {
-                    if (stopAsking) {
-                      await db.settings.update(MASTER_SETTINGS_KEY, {
-                        hideRegisterPromptOnNewContact: stopAsking,
-                      });
-                      this.hideRegisterPromptOnNewContact = stopAsking;
-                    }
-                  },
-                  onNo: async (stopAsking: boolean) => {
-                    if (stopAsking) {
-                      await db.settings.update(MASTER_SETTINGS_KEY, {
-                        hideRegisterPromptOnNewContact: stopAsking,
-                      });
-                      this.hideRegisterPromptOnNewContact = stopAsking;
-                    }
-                  },
-                  onYes: async () => {
-                    await this.register(newContact);
-                  },
-                  promptToStopAsking: true,
-                },
-                -1,
-              );
-            }, 500);
-          }
-        }
-      } catch (e) {
-        console.error("Error saving contact info:", e);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Contact Error",
-            text: "Could not save contact info. Check if it already exists.",
-          },
-          5000,
-        );
-      }
+  onScanDetect(content: any) {
+    if (content[0]?.rawValue) {
+      localStorage.setItem("contactEndorserUrl", content[0].rawValue);
+      this.$router.push({ name: "contacts" });
     } else {
       this.$notify(
         {
           group: "alert",
-          type: "danger",
+          type: "warning",
           title: "Invalid Contact QR Code",
           text: "No QR code detected with contact information.",
         },
-        5000,
-      );
-    }
-  }
-
-  async setVisibility(contact: Contact, visibility: boolean) {
-    const result = await setVisibilityUtil(
-      this.activeDid,
-      this.apiServer,
-      this.axios,
-      db,
-      contact,
-      visibility,
-    );
-    if (result.error) {
-      this.danger(result.error as string, "Error Setting Visibility");
-    } else if (!result.success) {
-      console.error("Got strange result from setting visibility:", result);
-    }
-  }
-
-  async register(contact: Contact) {
-    this.$notify(
-      {
-        group: "alert",
-        type: "toast",
-        text: "",
-        title: "Registration submitted...",
-      },
-      1000,
-    );
-
-    try {
-      const regResult = await register(
-        this.activeDid,
-        this.apiServer,
-        this.axios,
-        contact,
-      );
-      if (regResult.success) {
-        contact.registered = true;
-        db.contacts.update(contact.did, { registered: true });
-
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Registration Success",
-            text:
-              (contact.name || "That unnamed person") + " has been registered.",
-          },
-          5000,
-        );
-      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Registration Error",
-            text:
-              (regResult.error as string) ||
-              "Something went wrong during registration.",
-          },
-          5000,
-        );
-      }
-    } catch (error) {
-      console.error("Error when registering:", error);
-      let userMessage = "There was an error. See logs for more info.";
-      const serverError = error as AxiosError;
-      if (serverError) {
-        if (serverError.response?.data?.error?.message) {
-          userMessage = serverError.response.data.error.message;
-        } else if (serverError.message) {
-          userMessage = serverError.message; // Info for the user
-        } else {
-          userMessage = JSON.stringify(serverError.toJSON());
-        }
-      } else {
-        userMessage = error as string;
-      }
-      // Now set that error for the user to see.
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Registration Error",
-          text: userMessage,
-        },
-        5000,
+        -1,
       );
     }
   }
@@ -422,16 +199,15 @@ export default class ContactQRScanShow extends Vue {
     this.$notify(
       {
         group: "alert",
-        type: "danger",
+        type: "warning",
         title: "Invalid Scan",
         text: "The scan was invalid.",
       },
-      5000,
+      -1,
     );
   }
 
-  onCopyUrlToClipboard() {
-    //this.onScanDetect([{ rawValue: this.qrValue }]); // good for testing
+  onCopyToClipboard() {
     useClipboard()
       .copy(this.qrValue)
       .then(() => {
@@ -447,22 +223,5 @@ export default class ContactQRScanShow extends Vue {
         );
       });
   }
-
-  onCopyDidToClipboard() {
-    //this.onScanDetect([{ rawValue: this.qrValue }]); // good for testing
-    useClipboard()
-      .copy(this.activeDid)
-      .then(() => {
-        this.$notify(
-          {
-            group: "alert",
-            type: "info",
-            title: "Copied",
-            text: "Your DID was copied to the clipboard. Have them paste it on their 'People' screen to add you.",
-          },
-          10000,
-        );
-      });
-  }
 }
 </script>

src/views/DIDView.vue

@@ -1,327 +0,0 @@
-<template>
-  <QuickNav selected="Contacts" />
-  <TopMessage />
-
-  <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
-    <!-- Breadcrumb -->
-    <div id="ViewBreadcrumb" class="mb-8">
-      <h1 class="text-lg text-center font-light relative px-7">
-        <!-- Back -->
-        <button
-          @click="$router.go(-1)"
-          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-        >
-          <fa icon="chevron-left" class="fa-fw"></fa>
-        </button>
-        Identifier Details
-      </h1>
-    </div>
-
-    <!-- Identity Details -->
-    <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4">
-      <div>
-        <h2 class="text-xl font-semibold">
-          {{
-            didInfoForContact(viewingDid, activeDid, contact, allMyDids)
-              .displayName
-          }}
-        </h2>
-        <button @click="showDidDetails = !showDidDetails" class="ml-2 mr-2">
-          Details
-          <fa v-if="showDidDetails" icon="chevron-up" class="text-blue-400" />
-          <fa v-else icon="chevron-down" class="text-blue-400" />
-        </button>
-        <!-- Keep the dump contents directly between > and < to avoid weird spacing. -->
-        <pre
-          v-if="showDidDetails"
-          class="text-sm overflow-x-scroll px-4 py-3 bg-slate-100 rounded-md"
-          >{{ contactYaml }}</pre
-        >
-      </div>
-      <div class="flex justify-center mt-4">
-        <span v-if="contact?.profileImageUrl" class="flex justify-between">
-          <EntityIcon
-            :icon-size="96"
-            :profileImageUrl="contact?.profileImageUrl"
-            class="inline-block align-text-bottom border border-slate-300 rounded"
-            @click="showLargeIdenticonUrl = contact?.profileImageUrl"
-          />
-        </span>
-      </div>
-      <div class="mt-4">
-        <div class="flex justify-center">Auto-Generated Icon:</div>
-        <div class="flex justify-center">
-          <EntityIcon
-            :entityId="viewingDid"
-            :iconSize="64"
-            class="inline-block align-middle border border-slate-300 rounded-md mr-1"
-            @click="showLargeIdenticonId = viewingDid"
-          />
-        </div>
-      </div>
-      <div
-        v-if="showLargeIdenticonId || showLargeIdenticonUrl"
-        class="fixed z-[100] top-0 inset-x-0 w-full"
-      >
-        <div
-          class="absolute inset-0 h-screen flex flex-col items-center justify-center bg-slate-900/50"
-        >
-          <EntityIcon
-            :entityId="showLargeIdenticonId"
-            :iconSize="512"
-            :profileImageUrl="showLargeIdenticonUrl"
-            class="flex w-11/12 max-w-sm mx-auto mb-3 overflow-hidden bg-white rounded-lg shadow-lg"
-            @click="
-              showLargeIdenticonId = undefined;
-              showLargeIdenticonUrl = undefined;
-            "
-          />
-        </div>
-      </div>
-    </div>
-
-    <!-- Loading Animation -->
-    <div
-      class="fixed left-6 bottom-24 text-center text-4xl leading-none bg-slate-400 text-white w-14 py-2.5 rounded-full"
-      v-if="isLoading"
-    >
-      <fa icon="spinner" class="fa-spin-pulse"></fa>
-    </div>
-    <!-- Results List -->
-    <div v-if="claims.length > 0" class="mt-4">
-      <div class="text-l font-bold text-center">Claims That Involve Them</div>
-    </div>
-    <InfiniteScroll @reached-bottom="loadMoreData">
-      <ul>
-        <li
-          class="border-b border-slate-300"
-          v-for="claim in claims"
-          :key="claim.handleId"
-        >
-          <div class="grid grid-cols-12 gap-4">
-            <span class="col-span-2">
-              {{ claim.issuedAt.substring(0, 10) }}
-            </span>
-            <span class="col-span-2">
-              {{ capitalizeAndInsertSpacesBeforeCaps(claim.claimType) }}
-            </span>
-            <span class="col-span-2">
-              {{ claimAmount(claim) }}
-            </span>
-            <span class="col-span-5">
-              {{ claimDescription(claim) }}
-            </span>
-            <span class="col-span-1">
-              <a @click="onClickLoadClaim(claim.id)" class="cursor-pointer">
-                <fa icon="file-lines" class="pl-2 pt-1 text-blue-500" />
-              </a>
-            </span>
-          </div>
-        </li>
-      </ul>
-    </InfiniteScroll>
-
-    <div
-      v-if="!isLoading && claims.length === 0"
-      class="flex justify-center mt-4"
-    >
-      <span>They Are in No Claims Visible to You</span>
-    </div>
-  </section>
-</template>
-
-<script lang="ts">
-import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
-import * as yaml from "js-yaml";
-
-import QuickNav from "@/components/QuickNav.vue";
-import InfiniteScroll from "@/components/InfiniteScroll.vue";
-import TopMessage from "@/components/TopMessage.vue";
-import { NotificationIface } from "@/constants/app";
-import { accountsDB, db } from "@/db/index";
-import { Contact } from "@/db/tables/contacts";
-import { BoundingBox, MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import {
-  capitalizeAndInsertSpacesBeforeCaps,
-  didInfoForContact,
-  displayAmount,
-  getHeaders,
-  GenericCredWrapper,
-  GenericVerifiableCredential,
-  GiveVerifiableCredential,
-  OfferVerifiableCredential,
-} from "@/libs/endorserServer";
-import * as libsUtil from "@/libs/util";
-import EntityIcon from "@/components/EntityIcon.vue";
-
-@Component({
-  components: {
-    EntityIcon,
-    InfiniteScroll,
-    QuickNav,
-    TopMessage,
-  },
-})
-export default class DIDView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-
-  libsUtil = libsUtil;
-  yaml = yaml;
-
-  activeDid = "";
-  allMyDids: Array<string> = [];
-  apiServer = "";
-  claims: Array<GenericCredWrapper<GenericVerifiableCredential>> = [];
-  contact?: Contact;
-  contactYaml = "";
-  hitEnd = false;
-  isLoading = false;
-  searchBox: { name: string; bbox: BoundingBox } | null = null;
-  showDidDetails = false;
-  showLargeIdenticonId?: string;
-  showLargeIdenticonUrl?: string;
-  viewingDid?: string;
-
-  capitalizeAndInsertSpacesBeforeCaps = capitalizeAndInsertSpacesBeforeCaps;
-  didInfoForContact = didInfoForContact;
-  displayAmount = displayAmount;
-
-  async mounted() {
-    await db.open();
-    const settings = await db.settings.get(MASTER_SETTINGS_KEY);
-    this.activeDid = (settings?.activeDid as string) || "";
-    this.apiServer = (settings?.apiServer as string) || "";
-
-    const pathParam = window.location.pathname.substring("/did/".length);
-    if (pathParam) {
-      this.viewingDid = decodeURIComponent(pathParam);
-      this.contact = await db.contacts.get(this.viewingDid);
-      this.contactYaml = yaml.dump(this.contact);
-      await this.loadClaimsAbout();
-    } else {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "No claim ID was provided.",
-        },
-        -1,
-      );
-    }
-
-    await accountsDB.open();
-    const allAccounts = await accountsDB.accounts.toArray();
-    this.allMyDids = allAccounts.map((acc) => acc.did);
-  }
-
-  /**
-   * Data loader used by infinite scroller
-   * @param payload is the flag from the InfiniteScroll indicating if it should load
-   **/
-  async loadMoreData(payload: boolean) {
-    if (this.claims.length > 0 && !this.hitEnd && payload) {
-      this.loadClaimsAbout();
-    }
-  }
-
-  public async loadClaimsAbout() {
-    if (!this.viewingDid) {
-      console.error("This should never be called without a DID.");
-      return;
-    }
-
-    const queryParams = "claimContents=" + encodeURIComponent(this.viewingDid);
-    let postfix = "";
-    if (this.claims.length > 0) {
-      postfix = "&beforeId=" + this.claims[this.claims.length - 1].id;
-    }
-
-    try {
-      this.isLoading = true;
-      const response = await fetch(
-        this.apiServer + "/api/v2/report/claims?" + queryParams + postfix,
-        {
-          method: "GET",
-          headers: await getHeaders(this.activeDid),
-        },
-      );
-
-      if (response.status !== 200) {
-        const details = await response.text();
-        console.error("Problem with full search:", details);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: `There was a problem accessing the server. Try again later.`,
-          },
-          5000,
-        );
-        return;
-      }
-
-      const results = await response.json();
-      this.claims = this.claims.concat(results.data);
-      this.hitEnd = !results.hitLimit;
-
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (e: any) {
-      console.error("Error with feed load:", e);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: e.userMessage || "There was a problem retrieving claims.",
-        },
-        -1,
-      );
-    } finally {
-      this.isLoading = false;
-    }
-  }
-
-  onClickLoadClaim(jwtId: string) {
-    const route = {
-      path: "/claim/" + encodeURIComponent(jwtId),
-    };
-    (this.$router as Router).push(route);
-  }
-
-  public claimAmount(claim: GenericVerifiableCredential) {
-    if (claim.claimType === "GiveAction") {
-      const giveClaim = claim.claim as GiveVerifiableCredential;
-      if (giveClaim.object?.unitCode && giveClaim.object?.amountOfThisGood) {
-        return displayAmount(
-          giveClaim.object.unitCode,
-          giveClaim.object.amountOfThisGood,
-        );
-      } else {
-        return "";
-      }
-    } else if (claim.claimType === "Offer") {
-      const offerClaim = claim.claim as OfferVerifiableCredential;
-      if (
-        offerClaim.includesObject?.unitCode &&
-        offerClaim.includesObject?.amountOfThisGood
-      ) {
-        return displayAmount(
-          offerClaim.includesObject.unitCode,
-          offerClaim.includesObject.amountOfThisGood,
-        );
-      } else {
-        return "";
-      }
-    }
-    return "";
-  }
-
-  claimDescription(claim: GenericVerifiableCredential) {
-    return claim.claim.name || claim.claim.description || "";
-  }
-}
-</script>

src/views/DiscoverView.vue

@@ -6,7 +6,7 @@
   <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
     <!-- Heading -->
     <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
-      Discover Projects
+      Discover
     </h1>
 
     <!-- Quick Search -->
@@ -37,7 +37,7 @@
               isRemoteActive = false;
               searchLocal();
             "
-            v-bind:class="computedLocalTabStyleClassNames()"
+            v-bind:class="computedLocalTabClassNames()"
           >
             Nearby
             <span
@@ -57,7 +57,7 @@
               isLocalActive = false;
               searchAll();
             "
-            v-bind:class="computedRemoteTabStyleClassNames()"
+            v-bind:class="computedRemoteTabClassNames()"
           >
             Anywhere
             <span
@@ -74,7 +74,7 @@
     <div v-if="isLocalActive">
       <div>
         <button
-          class="ml-2 mt-2 px-4 py-2 rounded-md bg-blue-200 text-blue-500"
+          class="ml-2 px-4 py-2 rounded-md bg-blue-200 text-blue-500"
           @click="$router.push({ name: 'search-area' })"
         >
           Select a {{ searchBox ? "Different" : "" }} Location for Nearby Search
@@ -92,7 +92,7 @@
 
     <!-- Results List -->
     <InfiniteScroll @reached-bottom="loadMoreData">
-      <ul id="listDiscoverResults">
+      <ul>
         <li
           class="border-b border-slate-300"
           v-for="project in projects"
@@ -100,15 +100,14 @@
         >
           <a
             @click="onClickLoadProject(project.handleId)"
-            class="block py-4 flex gap-4 cursor-pointer"
+            class="block py-4 flex gap-4"
           >
-            <div>
+            <div class="w-12">
               <ProjectIcon
                 :entityId="project.handleId"
                 :iconSize="48"
-                :imageUrl="project.image"
-                class="block border border-slate-300 rounded-md max-h-12 max-w-12"
-              />
+                class="block border border-slate-300 rounded-md"
+              ></ProjectIcon>
             </div>
 
             <div class="grow">
@@ -129,20 +128,22 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import QuickNav from "@/components/QuickNav.vue";
 import InfiniteScroll from "@/components/InfiniteScroll.vue";
+import EntityIcon from "@/components/EntityIcon.vue";
 import ProjectIcon from "@/components/ProjectIcon.vue";
 import TopMessage from "@/components/TopMessage.vue";
 import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { Contact } from "@/db/tables/contacts";
 import { BoundingBox, MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import { didInfo, getHeaders, PlanData } from "@/libs/endorserServer";
+import { accessToken } from "@/libs/crypto";
+import { didInfo, PlanData } from "@/libs/endorserServer";
 
 @Component({
   components: {
+    EntityIcon,
     InfiniteScroll,
     ProjectIcon,
     QuickNav,
@@ -203,6 +204,30 @@ export default class DiscoverView extends Vue {
     }
   }
 
+  public async buildHeaders(): Promise<HeadersInit> {
+    const headers: HeadersInit = {
+      "Content-Type": "application/json",
+    };
+
+    if (this.activeDid) {
+      await accountsDB.open();
+      const allAccounts = await accountsDB.accounts.toArray();
+      const account = allAccounts.find((acc) => acc.did === this.activeDid);
+      const identity = JSON.parse(account?.identity || "null");
+
+      if (!identity) {
+        throw new Error(
+          "An ID is chosen but there are no keys for it so it cannot be used to talk with the service. Switch your ID.",
+        );
+      }
+
+      headers["Authorization"] = "Bearer " + (await accessToken(identity));
+    } else {
+      // it's OK without auth... we just won't get any identifiers
+    }
+    return headers;
+  }
+
   public async searchAll(beforeId?: string) {
     this.resetCounts();
 
@@ -223,7 +248,7 @@ export default class DiscoverView extends Vue {
         this.apiServer + "/api/v2/report/plans?" + queryParams,
         {
           method: "GET",
-          headers: await getHeaders(this.activeDid),
+          headers: await this.buildHeaders(),
         },
       );
 
@@ -248,15 +273,8 @@ export default class DiscoverView extends Vue {
       const plans: PlanData[] = results.data;
       if (plans) {
         for (const plan of plans) {
-          const { name, description, handleId, image, issuerDid, rowid } = plan;
-          this.projects.push({
-            name,
-            description,
-            handleId,
-            image,
-            issuerDid,
-            rowid,
-          });
+          const { name, description, handleId, issuerDid, rowid } = plan;
+          this.projects.push({ name, description, handleId, issuerDid, rowid });
         }
         this.remoteCount = this.projects.length;
       } else {
@@ -265,8 +283,6 @@ export default class DiscoverView extends Vue {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (e: any) {
       console.error("Error with feed load:", e);
-      // this sometimes gives different information
-      console.error("Error with feed load (error added): " + e);
       this.$notify(
         {
           group: "alert",
@@ -315,7 +331,7 @@ export default class DiscoverView extends Vue {
         this.apiServer + "/api/v2/report/plansByLocation?" + queryParams,
         {
           method: "GET",
-          headers: await getHeaders(this.activeDid),
+          headers: await this.buildHeaders(),
         },
       );
 
@@ -397,10 +413,10 @@ export default class DiscoverView extends Vue {
     const route = {
       path: "/project/" + encodeURIComponent(id),
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
-  public computedLocalTabStyleClassNames() {
+  public computedLocalTabClassNames() {
     return {
       "inline-block": true,
       "py-3": true,
@@ -418,7 +434,7 @@ export default class DiscoverView extends Vue {
     };
   }
 
-  public computedRemoteTabStyleClassNames() {
+  public computedRemoteTabClassNames() {
     return {
       "inline-block": true,
       "py-3": true,

src/views/GiftedDetails.vue

@@ -0,0 +1,459 @@
+<template>
+  <QuickNav />
+  <TopMessage />
+
+  <!-- CONTENT -->
+  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
+    <!-- Back -->
+    <div class="text-lg text-center font-light relative px-7">
+      <h1
+        class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
+        @click="cancel()"
+      >
+        <fa icon="chevron-left" class="fa-fw"></fa>
+      </h1>
+    </div>
+
+    <!-- Heading -->
+    <h1 class="text-4xl text-center font-light px-4 mb-4">What Was Given</h1>
+
+    <h1 class="text-xl font-bold text-center mb-4">
+      {{ message }} {{ giverName || "somebody not named" }}
+    </h1>
+    <textarea
+      class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
+      placeholder="What was received"
+      v-model="description"
+    />
+    <div class="flex flex-row justify-center">
+      <span
+        class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center text-blue-500 px-2 py-2 w-20"
+        @click="changeUnitCode()"
+      >
+        {{ libsUtil.UNIT_SHORT[unitCode] }}
+      </span>
+      <div
+        class="border border-r-0 border-slate-400 bg-slate-200 px-4 py-2"
+        @click="amountInput === '0' ? null : decrement()"
+      >
+        <fa icon="chevron-left" />
+      </div>
+      <input
+        type="number"
+        class="border border-r-0 border-slate-400 px-2 py-2 text-center w-20"
+        v-model="amountInput"
+      />
+      <div
+        class="rounded-r border border-slate-400 bg-slate-200 px-4 py-2"
+        @click="increment()"
+      >
+        <fa icon="chevron-right" />
+      </div>
+    </div>
+
+    <div class="flex justify-center mt-4">
+      <span v-if="imageUrl" class="flex justify-between">
+        <a :href="imageUrl" target="_blank" class="text-blue-500 ml-4">
+          <img :src="imageUrl" class="h-24 rounded-xl" />
+        </a>
+        <fa
+          icon="trash-can"
+          @click="confirmDeleteImage"
+          class="text-red-500 fa-fw ml-8 mt-10"
+        />
+      </span>
+      <span v-else>
+        <fa
+          icon="camera"
+          class="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-2 py-2 rounded-md"
+          @click="openPhotoDialog"
+        />
+      </span>
+    </div>
+    <GiftedPhotoDialog ref="photoDialog" />
+
+    <div v-if="projectId" class="mt-4">
+      <fa
+        icon="check"
+        class="bg-slate-500 text-white h-5 w-5 px-0.5 py-0.5 mr-2 rounded"
+      />
+      <label class="text-sm">This is given to a project</label>
+    </div>
+
+    <div v-if="!projectId" class="mt-4">
+      <input type="checkbox" class="h-6 w-6 mr-2" v-model="givenToUser" />
+      <label class="text-sm">Given to you</label>
+    </div>
+
+    <div class="mt-4">
+      <input type="checkbox" class="h-6 w-6 mr-2" v-model="isTrade" />
+      <label class="text-sm">Trade (not a gift)</label>
+    </div>
+
+    <p class="text-center mb-2 mt-6 italic">
+      Sign & Send to publish to the world
+      <fa
+        icon="circle-info"
+        class="pl-2 text-blue-500 cursor-pointer"
+        @click="explainData()"
+      />
+    </p>
+    <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+      <button
+        class="block w-full text-center text-lg font-bold 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-2 py-3 rounded-md"
+        @click="confirm"
+      >
+        Sign &amp; Send
+      </button>
+      <button
+        class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
+        @click="cancel"
+      >
+        Cancel
+      </button>
+    </div>
+  </section>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from "vue-facing-decorator";
+
+import { DEFAULT_IMAGE_API_SERVER, NotificationIface } from "@/constants/app";
+import QuickNav from "@/components/QuickNav.vue";
+import TopMessage from "@/components/TopMessage.vue";
+import { db } from "@/db/index";
+import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { createAndSubmitGive } from "@/libs/endorserServer";
+import * as libsUtil from "@/libs/util";
+import { accessToken } from "@/libs/crypto";
+import GiftedDialog from "@/components/GiftedDialog.vue";
+import GiftedPhotoDialog from "@/components/GiftedPhotoDialog.vue";
+
+@Component({
+  components: {
+    GiftedDialog,
+    GiftedPhotoDialog,
+    QuickNav,
+    TopMessage,
+  },
+})
+export default class GiftedDetails extends Vue {
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
+
+  activeDid = "";
+  apiServer = "";
+
+  amountInput = "0";
+  description = "";
+  givenToUser = false;
+  giverDid: string | undefined;
+  giverName = "";
+  imageUrl = "";
+  isTrade = false;
+  message = "";
+  offerId = "";
+  projectId = "";
+  unitCode = "HUR";
+
+  libsUtil = libsUtil;
+
+  async mounted() {
+    this.amountInput = this.$route.query.amountInput as string;
+    this.description = this.$route.query.description as string;
+    this.giverDid = this.$route.query.giverDid as string;
+    this.giverName = this.$route.query.giverName as string;
+    this.message = this.$route.query.message as string;
+    this.offerId = this.$route.query.offerId as string;
+    this.projectId = this.$route.query.projectId as string;
+    this.unitCode = this.$route.query.unitCode as string;
+
+    this.imageUrl = localStorage.getItem("imageUrl") || "";
+
+    this.givenToUser = !this.projectId;
+
+    try {
+      await db.open();
+      const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+      this.apiServer = settings?.apiServer || "";
+      this.activeDid = settings?.activeDid || "";
+
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    } catch (err: any) {
+      console.error("Error retrieving settings from database:", err);
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: err.message || "There was an error retrieving your settings.",
+        },
+        -1,
+      );
+    }
+  }
+
+  changeUnitCode() {
+    const units = Object.keys(this.libsUtil.UNIT_SHORT);
+    const index = units.indexOf(this.unitCode);
+    this.unitCode = units[(index + 1) % units.length];
+  }
+
+  increment() {
+    this.amountInput = `${(parseFloat(this.amountInput) || 0) + 1}`;
+  }
+
+  decrement() {
+    this.amountInput = `${Math.max(
+      0,
+      (parseFloat(this.amountInput) || 1) - 1,
+    )}`;
+  }
+
+  cancel() {
+    this.deleteImage(); // not awaiting, so they'll go back immediately
+    this.$router.back();
+  }
+
+  openPhotoDialog() {
+    (this.$refs.photoDialog as GiftedPhotoDialog).open((imgUrl) => {
+      this.imageUrl = imgUrl;
+    });
+  }
+
+  confirmDeleteImage() {
+    this.$notify(
+      {
+        group: "modal",
+        type: "confirm",
+        title: "Are you sure you want to delete the image?",
+        text: "",
+        onYes: this.deleteImage,
+      },
+      -1,
+    );
+  }
+
+  async deleteImage() {
+    if (!this.imageUrl) {
+      return;
+    }
+    try {
+      const identity = await libsUtil.getIdentity(this.activeDid);
+      const token = await accessToken(identity);
+      const response = await this.axios.delete(
+        DEFAULT_IMAGE_API_SERVER +
+          "/image/" +
+          encodeURIComponent(this.imageUrl),
+        {
+          headers: {
+            Authorization: `Bearer ${token}`,
+          },
+        },
+      );
+      if (response.status === 204) {
+        // don't bother with a notification
+        // (either they'll simply continue or they're canceling and going back)
+      } else {
+        console.error("Non-success deleting image:", response);
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: "There was a problem deleting the image.",
+          },
+          5000,
+        );
+        // keep the imageUrl in localStorage so the user can try again if they want
+        return;
+      }
+
+      localStorage.removeItem("imageUrl");
+      this.imageUrl = "";
+    } catch (error) {
+      console.error("Error deleting image:", error);
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      if ((error as any).response.status === 404) {
+        console.log("The image was already deleted:", error);
+
+        localStorage.removeItem("imageUrl");
+        this.imageUrl = "";
+
+        // it already doesn't exist so we won't say anything to the user
+      } else {
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: "There was an error deleting the image.",
+          },
+          5000,
+        );
+      }
+    }
+  }
+
+  async confirm() {
+    if (!this.activeDid) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "You must select an identifier before you can record a give.",
+        },
+        2000,
+      );
+      return;
+    }
+    if (parseFloat(this.amountInput) < 0) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          text: "You may not send a negative number.",
+          title: "",
+        },
+        2000,
+      );
+      return;
+    }
+    if (!this.description && !parseFloat(this.amountInput)) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: `You must enter a description or some number of ${
+            this.libsUtil.UNIT_LONG[this.unitCode]
+          }.`,
+        },
+        2000,
+      );
+      return;
+    }
+
+    this.$notify(
+      {
+        group: "alert",
+        type: "toast",
+        text: "Recording the give...",
+        title: "",
+      },
+      1000,
+    );
+
+    // this is asynchronous, but we don't need to wait for it to complete
+    await this.recordGive();
+  }
+
+  /**
+   *
+   * @param giverDid may be null
+   * @param description may be an empty string
+   * @param amountInput may be 0
+   * @param unitCode may be omitted, defaults to "HUR"
+   */
+  public async recordGive() {
+    try {
+      const identity = await libsUtil.getIdentity(this.activeDid);
+      const result = await createAndSubmitGive(
+        this.axios,
+        this.apiServer,
+        identity,
+        this.giverDid,
+        this.givenToUser ? this.activeDid : undefined,
+        this.description,
+        parseFloat(this.amountInput),
+        this.unitCode,
+        this.projectId,
+        this.offerId,
+        this.isTrade,
+        this.imageUrl,
+      );
+
+      if (
+        result.type === "error" ||
+        this.isGiveCreationError(result.response)
+      ) {
+        const errorMessage = this.getGiveCreationErrorMessage(result);
+        console.error("Error with give creation result:", result);
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: errorMessage || "There was an error creating the give.",
+          },
+          -1,
+        );
+      } else {
+        this.$notify(
+          {
+            group: "alert",
+            type: "success",
+            title: "Success",
+            text: `That ${this.isTrade ? "trade" : "gift"} was recorded.`,
+          },
+          5000,
+        );
+        localStorage.removeItem("imageUrl");
+        this.$router.back();
+      }
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    } catch (error: any) {
+      console.error("Error with give recordation caught:", error);
+      const message =
+        error.userMessage ||
+        error.response?.data?.error?.message ||
+        "There was an error recording the give.";
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: message,
+        },
+        -1,
+      );
+    }
+  }
+
+  // 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(
+      {
+        group: "alert",
+        type: "success",
+        title: "Data Sharing",
+        text: libsUtil.PRIVACY_MESSAGE,
+      },
+      -1,
+    );
+  }
+}
+</script>

src/views/GiftedDetailsView.vue

@@ -1,752 +0,0 @@
-<template>
-  <QuickNav />
-  <TopMessage />
-
-  <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
-    <!-- Back -->
-    <div
-      v-if="!hideBackButton"
-      class="text-lg text-center font-light relative px-7"
-    >
-      <h1
-        class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-        @click="cancelBack()"
-      >
-        <fa icon="chevron-left" class="fa-fw"></fa>
-      </h1>
-    </div>
-
-    <!-- Heading -->
-    <h1 class="text-4xl text-center font-light px-4 mb-4">What Was Given</h1>
-
-    <h1 class="text-xl font-bold text-center mb-4">
-      <span>From {{ giverName }}</span>
-      <span>
-        to
-        {{
-          givenToProject
-            ? projectName
-            : givenToRecipient
-              ? recipientName
-              : "someone unidentified"
-        }}</span
-      >
-    </h1>
-    <textarea
-      class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
-      placeholder="What was received"
-      v-model="description"
-    />
-    <div class="flex flex-row justify-center">
-      <span
-        class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center text-blue-500 px-2 py-2 w-20"
-        @click="changeUnitCode()"
-      >
-        {{ libsUtil.UNIT_SHORT[unitCode] || unitCode }}
-      </span>
-      <div
-        class="border border-r-0 border-slate-400 bg-slate-200 px-4 py-2"
-        @click="amountInput === '0' ? null : decrement()"
-      >
-        <fa icon="chevron-left" />
-      </div>
-      <input
-        type="number"
-        class="border border-r-0 border-slate-400 px-2 py-2 text-center w-20"
-        v-model="amountInput"
-      />
-      <div
-        class="rounded-r border border-slate-400 bg-slate-200 px-4 py-2"
-        @click="increment()"
-      >
-        <fa icon="chevron-right" />
-      </div>
-    </div>
-
-    <div class="flex justify-center mt-4" data-testid="imagery">
-      <span v-if="imageUrl" class="flex justify-between">
-        <a :href="imageUrl" target="_blank">
-          <img :src="imageUrl" class="h-24 rounded-xl" />
-        </a>
-        <fa
-          icon="trash-can"
-          @click="confirmDeleteImage"
-          class="text-red-500 fa-fw ml-8 mt-10"
-        />
-      </span>
-      <span v-else>
-        <fa
-          icon="camera"
-          class="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-2 py-2 rounded-md"
-          @click="openImageDialog"
-        />
-      </span>
-    </div>
-    <ImageMethodDialog ref="imageDialog" />
-
-    <div class="h-7 mt-4 flex">
-      <input
-        v-if="projectId && !givenToRecipient"
-        type="checkbox"
-        class="h-6 w-6 mr-2"
-        v-model="givenToProject"
-      />
-      <fa
-        v-else
-        icon="square"
-        class="bg-slate-500 text-slate-500 h-5 w-5 px-0.5 py-0.5 mr-2 rounded"
-        @click="notifyUserOfProject()"
-      />
-      <label class="text-sm mt-1">
-        {{
-          projectId
-            ? "This was given to " + projectName
-            : "No project was chosen"
-        }}
-      </label>
-    </div>
-
-    <div class="h-7 mt-4 flex">
-      <input
-        v-if="recipientDid && !givenToProject"
-        type="checkbox"
-        class="h-6 w-6 mr-2"
-        v-model="givenToRecipient"
-      />
-      <fa
-        v-else
-        icon="square"
-        class="bg-slate-500 text-slate-500 h-5 w-5 px-0.5 py-0.5 mr-2 rounded"
-        @click="notifyUserOfRecipient()"
-      />
-      <label class="text-sm mt-1">
-        {{
-          recipientDid
-            ? "This was given to " + recipientName
-            : "No recipient was chosen."
-        }}
-      </label>
-    </div>
-
-    <div class="mt-4 flex">
-      <input type="checkbox" class="h-6 w-6 mr-2" v-model="isTrade" />
-      <label class="text-sm mt-1">This was a trade (not a gift)</label>
-    </div>
-
-    <div class="mt-4 flex">
-      <router-link
-        :to="{
-          name: 'claim-add-raw',
-          query: {
-            claim: constructGiveParam(),
-          },
-        }"
-        class="text-blue-500"
-      >
-        Edit & Submit Raw
-      </router-link>
-    </div>
-
-    <p class="text-center mb-2 mt-6 italic">
-      Sign & Send to publish to the world
-      <fa
-        icon="circle-info"
-        class="pl-2 text-blue-500 cursor-pointer"
-        @click="explainData()"
-      />
-    </p>
-    <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
-      <button
-        class="block w-full text-center text-lg font-bold 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-2 py-3 rounded-md"
-        @click="confirm"
-      >
-        Sign &amp; Send
-      </button>
-      <button
-        class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
-        @click="cancel"
-      >
-        Cancel
-      </button>
-    </div>
-  </section>
-</template>
-
-<script lang="ts">
-import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
-
-import ImageMethodDialog from "@/components/ImageMethodDialog.vue";
-import QuickNav from "@/components/QuickNav.vue";
-import TopMessage from "@/components/TopMessage.vue";
-import { DEFAULT_IMAGE_API_SERVER, NotificationIface } from "@/constants/app";
-import { accountsDB, db } from "@/db/index";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
-import {
-  createAndSubmitGive,
-  didInfo,
-  editAndSubmitGive,
-  GenericCredWrapper,
-  getHeaders,
-  getPlanFromCache,
-  GiveVerifiableCredential,
-  hydrateGive,
-} from "@/libs/endorserServer";
-import * as libsUtil from "@/libs/util";
-import { Contact } from "@/db/tables/contacts";
-
-@Component({
-  components: {
-    ImageMethodDialog,
-    QuickNav,
-    TopMessage,
-  },
-})
-export default class GiftedDetails extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-
-  activeDid = "";
-  apiServer = "";
-
-  amountInput = "0";
-  description = "";
-  destinationPathAfter = "";
-  givenToProject = false;
-  givenToRecipient = false;
-  giverDid: string | undefined;
-  giverName = "";
-  hideBackButton = false;
-  imageUrl = "";
-  isTrade = false;
-  message = "";
-  offerId = "";
-  prevCredToEdit?: GenericCredWrapper<GiveVerifiableCredential>;
-  projectId = "";
-  projectName = "a project";
-  recipientDid = "";
-  recipientName = "";
-  unitCode = "HUR";
-
-  libsUtil = libsUtil;
-
-  async mounted() {
-    try {
-      this.prevCredToEdit = (this.$route as Router).query["prevCredToEdit"]
-        ? (JSON.parse(
-            (this.$route as Router).query["prevCredToEdit"],
-          ) as GenericCredWrapper<GiveVerifiableCredential>)
-        : undefined;
-    } catch (error) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Retrieval Error",
-          text: "The previous record isn't available for editing. If you submit, you'll create a new record.",
-        },
-        6000,
-      );
-    }
-
-    const prevAmount = this.prevCredToEdit?.claim?.object?.amountOfThisGood;
-    this.amountInput =
-      (this.$route as Router).query["amountInput"] ||
-      (prevAmount ? String(prevAmount) : "") ||
-      this.amountInput;
-    this.description =
-      (this.$route as Router).query["description"] ||
-      this.prevCredToEdit?.claim?.description ||
-      this.description;
-    this.destinationPathAfter = (this.$route as Router).query[
-      "destinationPathAfter"
-    ];
-    this.giverDid = ((this.$route as Router).query["giverDid"] ||
-      this.prevCredToEdit?.claim?.agent?.identifier ||
-      this.giverDid) as string;
-    this.giverName =
-      ((this.$route as Router).query["giverName"] as string) || "";
-    this.hideBackButton =
-      (this.$route as Router).query["hideBackButton"] === "true";
-    this.message = ((this.$route as Router).query["message"] as string) || "";
-
-    // find any offer ID
-    const fulfills = this.prevCredToEdit?.claim?.fulfills;
-    const fulfillsArray = Array.isArray(fulfills)
-      ? fulfills
-      : fulfills
-        ? [fulfills]
-        : [];
-    const offer = fulfillsArray.find((rec) => rec["@type"] === "Offer");
-    this.offerId = ((this.$route as Router).query["offerId"] ||
-      offer?.identifier ||
-      this.offerId) as string;
-
-    // find any project ID
-    const project = fulfillsArray.find((rec) => rec["@type"] === "PlanAction");
-    this.projectId = ((this.$route as Router).query["projectId"] ||
-      project?.identifier ||
-      this.projectId) as string;
-
-    this.recipientDid = ((this.$route as Router).query["recipientDid"] ||
-      this.prevCredToEdit?.claim?.recipient?.identifier) as string;
-    this.recipientName =
-      ((this.$route as Router).query["recipientName"] as string) || "";
-    this.unitCode = ((this.$route as Router).query["unitCode"] ||
-      this.prevCredToEdit?.claim?.object?.unitCode ||
-      this.unitCode) as string;
-
-    this.imageUrl =
-      ((this.$route as Router).query["imageUrl"] as string) ||
-      this.prevCredToEdit?.claim?.image ||
-      localStorage.getItem("imageUrl") ||
-      this.imageUrl;
-
-    // this is an endpoint for sharing project info to highlight something given
-    // https://developer.mozilla.org/en-US/docs/Web/Manifest/share_target
-    if ((this.$route as Router).query["shareTitle"]) {
-      this.description =
-        ((this.$route as Router).query["shareTitle"] as string) +
-        (this.description ? "\n" + this.description : "");
-    }
-    if ((this.$route as Router).query["shareText"]) {
-      this.description =
-        (this.description ? this.description + "\n" : "") +
-        ((this.$route as Router).query["shareText"] as string);
-    }
-    if ((this.$route as Router).query["shareUrl"]) {
-      this.imageUrl = (this.$route as Router).query["shareUrl"] as string;
-    }
-
-    try {
-      await db.open();
-      const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
-      this.apiServer = settings?.apiServer || "";
-      this.activeDid = settings?.activeDid || "";
-
-      let allContacts: Contact[] = [];
-      let allMyDids: string[] = [];
-      if (
-        (this.giverDid && !this.giverName) ||
-        (this.recipientDid && !this.recipientName)
-      ) {
-        allContacts = await db.contacts.toArray();
-
-        await accountsDB.open();
-        const allAccounts = await accountsDB.accounts.toArray();
-        allMyDids = allAccounts.map((acc) => acc.did);
-        if (this.giverDid && !this.giverName) {
-          this.giverName = didInfo(
-            this.giverDid,
-            this.activeDid,
-            allMyDids,
-            allContacts,
-          );
-        }
-        if (this.recipientDid && !this.recipientName) {
-          this.recipientName = didInfo(
-            this.recipientDid,
-            this.activeDid,
-            allMyDids,
-            allContacts,
-          );
-        }
-      }
-      // these should be functions but something's wrong with the syntax in the <> conditional
-      this.givenToProject = !!this.projectId;
-      this.givenToRecipient = !this.givenToProject && !!this.recipientDid;
-
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (err: any) {
-      console.error("Error retrieving settings from database:", err);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: err.message || "There was an error retrieving your settings.",
-        },
-        -1,
-      );
-    }
-
-    if (this.projectId) {
-      // console.log("Getting project name from cache", this.projectId);
-      const project = await getPlanFromCache(
-        this.projectId,
-        this.axios,
-        this.apiServer,
-        this.activeDid,
-      );
-      this.projectName = project?.name
-        ? "the project: " + project.name
-        : "a project";
-    }
-  }
-
-  changeUnitCode() {
-    const units = Object.keys(this.libsUtil.UNIT_SHORT);
-    const index = units.indexOf(this.unitCode);
-    this.unitCode = units[(index + 1) % units.length];
-  }
-
-  increment() {
-    this.amountInput = `${(parseFloat(this.amountInput) || 0) + 1}`;
-  }
-
-  decrement() {
-    this.amountInput = `${Math.max(
-      0,
-      (parseFloat(this.amountInput) || 1) - 1,
-    )}`;
-  }
-
-  cancel() {
-    this.deleteImage(); // not awaiting, so they'll go back immediately
-    if (this.destinationPathAfter) {
-      (this.$router as Router).push({ path: this.destinationPathAfter });
-    } else {
-      (this.$router as Router).back();
-    }
-  }
-
-  cancelBack() {
-    this.deleteImage(); // not awaiting, so they'll go back immediately
-    (this.$router as Router).back();
-  }
-
-  openImageDialog() {
-    (this.$refs.imageDialog as ImageMethodDialog).open((imgUrl) => {
-      this.imageUrl = imgUrl;
-    }, "GiveAction");
-  }
-
-  confirmDeleteImage() {
-    this.$notify(
-      {
-        group: "modal",
-        type: "confirm",
-        title: "Are you sure you want to delete the image?",
-        text: "",
-        onYes: this.deleteImage,
-      },
-      -1,
-    );
-  }
-
-  async deleteImage() {
-    if (!this.imageUrl) {
-      return;
-    }
-    try {
-      const headers = await getHeaders(this.activeDid);
-      const response = await this.axios.delete(
-        DEFAULT_IMAGE_API_SERVER +
-          "/image/" +
-          encodeURIComponent(this.imageUrl),
-        { headers },
-      );
-      if (response.status === 204) {
-        // don't bother with a notification
-        // (either they'll simply continue or they're canceling and going back)
-      } else {
-        console.error("Problem deleting image:", response);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "There was a problem deleting the image.",
-          },
-          5000,
-        );
-        // keep the imageUrl in localStorage so the user can try again if they want
-        return;
-      }
-
-      localStorage.removeItem("imageUrl");
-      this.imageUrl = "";
-    } catch (error) {
-      console.error("Error deleting image:", error);
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      if ((error as any).response.status === 404) {
-        console.log("The image was already deleted:", error);
-
-        localStorage.removeItem("imageUrl");
-        this.imageUrl = "";
-
-        // it already doesn't exist so we won't say anything to the user
-      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "There was an error deleting the image.",
-          },
-          5000,
-        );
-      }
-    }
-  }
-
-  async confirm() {
-    if (!this.activeDid) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "You must select an identifier before you can record a give.",
-        },
-        2000,
-      );
-      return;
-    }
-    if (parseFloat(this.amountInput) < 0) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          text: "You may not send a negative number.",
-          title: "",
-        },
-        2000,
-      );
-      return;
-    }
-    if (!this.description && !parseFloat(this.amountInput)) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: `You must enter a description or some number of ${
-            this.libsUtil.UNIT_LONG[this.unitCode]
-          }.`,
-        },
-        2000,
-      );
-      return;
-    }
-
-    this.$notify(
-      {
-        group: "alert",
-        type: "toast",
-        text: "Recording the give...",
-        title: "",
-      },
-      1000,
-    );
-
-    // this is asynchronous, but we don't need to wait for it to complete
-    await this.recordGive();
-  }
-
-  notifyUserOfProject() {
-    if (!this.projectId) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "Error",
-          text: "To assign to a project, you must open this page through a project.",
-        },
-        3000,
-      );
-    } else {
-      // must be because givenToRecipient is true
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "Error",
-          text: "You cannot assign both to a project and to a recipient.",
-        },
-        3000,
-      );
-    }
-  }
-
-  notifyUserOfRecipient() {
-    if (!this.recipientDid) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "Error",
-          text: "To assign to a recipient, you must open this page from a contact.",
-        },
-        3000,
-      );
-    } else {
-      // must be because givenToProject is true
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "Error",
-          text: "You cannot assign both to a recipient and to a project.",
-        },
-        3000,
-      );
-    }
-  }
-
-  /**
-   *
-   * @param giverDid may be null
-   * @param description may be an empty string
-   * @param amountInput may be 0
-   * @param unitCode may be omitted, defaults to "HUR"
-   */
-  public async recordGive() {
-    try {
-      const recipientDid = this.givenToRecipient
-        ? this.recipientDid
-        : undefined;
-      const projectId = this.givenToProject ? this.projectId : undefined;
-      let result;
-      if (this.prevCredToEdit) {
-        // don't create from a blank one in case some properties were set from a different interface
-        result = await editAndSubmitGive(
-          this.axios,
-          this.apiServer,
-          this.prevCredToEdit,
-          this.activeDid,
-          this.giverDid,
-          recipientDid,
-          this.description,
-          parseFloat(this.amountInput),
-          this.unitCode,
-          projectId,
-          this.offerId,
-          this.isTrade,
-          this.imageUrl,
-        );
-      } else {
-        result = await createAndSubmitGive(
-          this.axios,
-          this.apiServer,
-          this.activeDid,
-          this.giverDid,
-          recipientDid,
-          this.description,
-          parseFloat(this.amountInput),
-          this.unitCode,
-          projectId,
-          this.offerId,
-          this.isTrade,
-          this.imageUrl,
-        );
-      }
-
-      if (
-        result.type === "error" ||
-        this.isGiveCreationError(result.response)
-      ) {
-        const errorMessage = this.getGiveCreationErrorMessage(result);
-        console.error("Error with give creation result:", result);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: errorMessage || "There was an error creating the give.",
-          },
-          -1,
-        );
-      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Success",
-            text: `That ${this.isTrade ? "trade" : "gift"} was recorded.`,
-          },
-          5000,
-        );
-        localStorage.removeItem("imageUrl");
-        if (this.destinationPathAfter) {
-          (this.$router as Router).push({ path: this.destinationPathAfter });
-        } else {
-          (this.$router as Router).back();
-        }
-      }
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (error: any) {
-      console.error("Error with give recordation caught:", error);
-      const errorMessage =
-        error.userMessage ||
-        error.response?.data?.error?.message ||
-        "There was an error recording the give.";
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: errorMessage,
-        },
-        -1,
-      );
-    }
-  }
-
-  constructGiveParam() {
-    const recipientDid = this.givenToRecipient ? this.recipientDid : undefined;
-    const projectId = this.givenToProject ? this.projectId : undefined;
-    const giveClaim = hydrateGive(
-      this.prevCredToEdit?.claim as GiveVerifiableCredential,
-      this.giverDid,
-      recipientDid,
-      this.description,
-      parseFloat(this.amountInput),
-      this.unitCode,
-      projectId,
-      this.offerId,
-      this.isTrade,
-      this.imageUrl,
-      this.prevCredToEdit?.id as string,
-    );
-    const claimStr = JSON.stringify(giveClaim);
-    return claimStr;
-  }
-
-  // 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(
-      {
-        group: "alert",
-        type: "success",
-        title: "Data Sharing",
-        text: libsUtil.PRIVACY_MESSAGE,
-      },
-      -1,
-    );
-  }
-}
-</script>

src/views/HelpView.vue

@@ -24,22 +24,23 @@
     <!-- eslint-disable prettier/prettier -->
     <div>
       <p>
-        This app focuses on gifts & gratitude, using them to build cool things with your network.
+        This app is a window into data that you and your friends own, focused on
+        gifts and collaboration.
       </p>
 
       <h2 class="text-xl font-semibold">What is the idea here?</h2>
       <p>
         We are building networks of people who want to grow a giving society.
-        First of all, let's build gratitude: see what people have given, and recognize
-        gifts you've seen. This is done in a way that leaves a permanent record -- one that
-        came from you, and one that the recipient can prove it was for them. This is
+        First of all, you can see what people have given, and also recognize
+        gifts you've seen, in a way that leaves a permanent record -- one that
+        came from you, and the recipient can prove it was for them. This is
         personally gratifying, but it extends to broader work: volunteers get
         confirmation of activity, and selectively show off their contributions
         and network.
       </p>
       <p>
-        With this, you highlight giving and also offer help --
-        which could be conditional on others' willingness to help, too.
+        You highlight giving and also offer help to ideas -- which could be
+        conditional on others' willingness to help, too.
         You can record your own ideas and invite others to collaborate.
       </p>
       <p>
@@ -58,28 +59,14 @@
         <fa icon="users" class="fa-fw" /> page. After they register you, you can
         select any contact on the home page (or "anonymous") and record your
         appreciation for... whatever. The main goal is to record what people
-        have given you, to grow giving economies. You can also record your own
-        ideas for projects. Each claim is recorded on a
+        have given you, to grow giving economies. Each claim is recorded on a
         custom ledger. The day after being registered, you'll be able to able to
-        register others, too.
+        register others; later, you can create projects, too.
       </p>
       <p>
-        Note that there are limits to how many others you can register.
-        Take your time to bring people on... make it an opportunity to get to
-        know their projects, and to show your own.
-      </p>
-
-      <h2 class="text-xl font-semibold">How do I add someone else?</h2>
-      <p>
-        <a href="/help-onboarding" target="_blank" class="text-blue-500">
-          Use these instructions.
-        </a>
-        To start scanning, go to the
-        <router-link class="text-blue-500" to="/contact-qr">contact-scanning page.</router-link>
-      </p>
-      <p>
-        If they are not nearby to scan QR codes, you each can tap on the QR code
-        and paste it into the text box on the Contacts <fa icon="users" class="fa-fw" /> page.
+        Note that there are rate limits to how many others you can register,
+        so it may take some time to register everyone you want. Take your time...
+        make it an opportunity to get to know their projects, and show your own.
       </p>
 
       <h2 class="text-xl font-semibold">
@@ -89,13 +76,32 @@
       <p>
         Go
         <router-link class="text-blue-500" to="/import-account">import your identifier</router-link>.
+        If you don't want the old one, click "Advanced" and check the box to erase it.
+        (The erase option only shows if you have exactly one identifier.
+         For more in-depth surgery, you'll have to erase data from the browser or reinstall.)
+      </p>
+
+      <h2 class="text-xl font-semibold">How do I add someone else?</h2>
+      <p>
+        <a href="/help-onboarding" target="_blank" class="text-blue-500">
+          Click here to show an alert with the steps.
+        </a>
+        To start scanning, go
+        <router-link class="text-blue-500" to="/contact-qr">here.</router-link>
+      </p>
+      <p>
+        If they are not nearby to scan QR codes, tell them to copy their ID from
+        their Identity <fa icon="circle-user" class="fa-fw" /> page, which
+        typically starts with "did:ethr:...", and send it to you. Go to the
+        Contacts <fa icon="users" class="fa-fw" /> page and enter that into the
+        top form. To add a name, put a comma and then their name; to add their
+        public key, put another comma followed by the key.
       </p>
 
       <h2 class="text-xl font-semibold">How do I backup all my data?</h2>
       <p>
-        There are four sets of data to backup: the identifier secrets;
-        the private text data that isn't quite as secret such as settings and contacts;
-        the private image for yourself; and the data that you have sent to the public.
+        There are two sets of data to backup: the identifier secrets and the
+        other data that isn't quite a secret such as settings, contacts, etc.
       </p>
 
       <div class="px-4">
@@ -116,7 +122,7 @@
         </ul>
 
         <h2 class="text-xl font-semibold">
-          How do I backup my other private text data like settings & contacts?
+          How do I backup my other (non-identifier-secret) data?
         </h2>
         <ul class="list-disc list-outside ml-4">
           <li>
@@ -128,27 +134,6 @@
             won't lose it.
           </li>
         </ul>
-
-        <h2 class="text-xl font-semibold">
-          How do I backup my profile image?
-        </h2>
-        <ul class="list-disc list-outside ml-4">
-          <li>
-            Go to Your Identity <fa icon="circle-user" class="fa-fw" /> page,
-            tap on your image, and save it.
-          </li>
-        </ul>
-
-        <h2 class="text-xl font-semibold">
-          How do I backup other data I've posted?
-        </h2>
-        <ul class="list-disc list-outside ml-4">
-          <li>
-            This requires use of the API, so investigate the endpoints
-            <a href="https://api.endorser.ch/" target="_blank" class="text-blue-500">here</a>
-            (particularly the "claim" endpoints).
-          </li>
-        </ul>
       </div>
 
       <h2 class="text-xl font-semibold">How do I restore my data?</h2>
@@ -177,7 +162,6 @@
           <li>
             Go to Your Identity <fa icon="circle-user" class="fa-fw" /> page,
             click Advanced, and follow the instructions for the Contacts & Settings Database "Import".
-            Beware that this will erase your existing contact & settings.
           </li>
         </ul>
       </div>
@@ -194,15 +178,13 @@
 
       <h2 class="text-xl font-semibold">How do I erase my data?</h2>
       <p>
-        Before doing this, you may want to back up your data with the instructions above.
+        Before doing this, note the two kinds of data to backup: identity data,
+        and other data for contacts and settings (see instructions above).
       </p>
       <ul>
         <li class="list-disc list-outside ml-4">
           Mobile
           <ul>
-            <li class="list-disc list-outside ml-4">
-              Home Screen: hold down on the icon, and choose to delete it
-            </li>
             <li class="list-disc list-outside ml-4">
               Chrome: Settings -> Privacy and Security -> Clear Browsing Data
             </li>
@@ -216,11 +198,11 @@
           <ul>
             <li class="list-disc list-outside ml-4">
               Chrome:
-              Clear at "chrome://settings/content/all" and
+              Clear at chrome://settings/content/all and
               also clear under dev tools Application
             </li>
             <li class="list-disc list-outside ml-4">
-              Firefox: Navigate to "about:preferences", Manage Data,
+              Firefox: <a href="about:preferences">go here</a>, Manage Data,
               find timesafari.app and select, hit Remove Selected, then Save
               Changes
             </li>
@@ -250,7 +232,7 @@
       <p>
         There is a even more functionality in a mobile app (and more
         documentation) at
-        <a href="https://endorser.ch" target="_blank" class="text-blue-500">
+        <a href="https://endorser.ch" class="text-blue-500">
           EndorserSearch.com
         </a>
       </p>
@@ -303,11 +285,6 @@
           and you may have to close all your tabs. In addition, it may be running as an
           installed app, so look for any Time Safari app that may be running outside a browser.
         </li>
-        <li>
-          There may be a problem with your identity. Go to the Identity
-          <fa icon="circle-user" class="fa-fw" /> page, then "Advanced", and "Switch Identifier"
-          and you may see helpful info there. If it shows a problem, try adding your identifier again.
-        </li>
         <li>
           It can help to reregister the service worker:
           <ul>
@@ -321,7 +298,7 @@
               find "timesafari.app", and click "Unregister".
             </li>
             <li>
-              <a href="https://duckduckgo.com/?q=unregister+service+worker" target="_blank" class="text-blue-500">Search</a>
+              <a href="https://duckduckgo.com/?q=unregister+service+worker" class="text-blue-500">Search</a>
               for instructions for other browsers.</li>
           </ul>
           Then reload Time Safari.
@@ -341,7 +318,7 @@
 
       <h2 class="text-xl font-semibold">What are the terms & conditions and the privacy policy?</h2>
       <p style="display:inline; align-items: center">
-        This work is public domain. If you like rules, reference
+        This work is public domain, governed by
         <a href="http://creativecommons.org/publicdomain/zero/1.0?ref=chooser-v1" target="_blank" rel="license noopener noreferrer">
           <span class="text-blue-500 mr-1">CC0 1.0</span>
           <img
@@ -362,35 +339,15 @@
         by disabling notifications on the Account <fa icon="circle-user" class="fa-fw" /> page.
         <br />
         For all other claim data,
-        <a href="https://endorser.ch/privacy-policy" target="_blank" class="text-blue-500">
+        <a href="https://endorser.ch/privacy-policy" class="text-blue-500">
           the Endorser Service has this Privacy Policy.
         </a>
       </p>
 
-      <h2 class="text-xl font-semibold">How can I contribute?</h2>
-      <p>
-        If you have skills, contact us below.
-        If you have Bitcoin, donate to
-        <button
-          @click="
-            doCopyTwoSecRedo(
-              'bc1q90v4ted6cpt63tjfh2lvd5xzfc67sd4g9w8xma',
-              () => (showDidCopy = !showDidCopy)
-            )
-          "
-          class="text-blue-500 ml-2"
-        >
-          bc1q90v4ted6cpt63tjfh2lvd5xzfc67sd4g9w8xma
-          <fa v-show="!showDidCopy" icon="copy" class="text-slate-400 fa-fw" />
-        </button>
-        <span v-show="showDidCopy" class="ml-2 text-sm text-green-500">Copied</span>
-        For other donations, contact us.
-      </p>
-
       <h2 class="text-xl font-semibold">Where can I read more?</h2>
       <p>
         This is part of the
-        <a href="https://livesofgiving.org" target="_blank" class="text-blue-500">
+        <a href="https://livesofgiving.org" class="text-blue-500">
           Lives of Giving
         </a>
         initiative.
@@ -400,7 +357,7 @@
       <p>{{ package.version }} ({{ commitHash }})</p>
 
       <h2 class="text-xl font-semibold">
-        For any other questions, like getting a new account or removing all your data from the public ledger:
+        For any other questions, including removing your data:
       </h2>
       <p>
         Contact us at
@@ -415,7 +372,6 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { useClipboard } from "@vueuse/core";
 
 import * as Package from "../../package.json";
 import QuickNav from "@/components/QuickNav.vue";
@@ -427,14 +383,5 @@ export default class Help extends Vue {
 
   package = Package;
   commitHash = import.meta.env.VITE_GIT_HASH;
-  showDidCopy = false;
-
-  // call fn, copy text to the clipboard, then redo fn after 2 seconds
-  doCopyTwoSecRedo(text: string, fn: () => void) {
-    fn();
-    useClipboard()
-      .copy(text)
-      .then(() => setTimeout(fn, 2000));
-  }
 }
 </script>

src/views/HomeView.vue

@@ -5,7 +5,7 @@
   <!-- CONTENT -->
   <section id="Content" class="p-2 pb-24 max-w-3xl mx-auto">
     <h1 id="ViewHeading" class="text-4xl text-center font-light px-4 mb-8">
-      {{ AppString.APP_NAME }}
+      Time Safari
     </h1>
 
     <!-- prompt to install notifications -->
@@ -62,108 +62,117 @@
     <div v-if="showShortcutBvc" class="mb-4">
       <router-link
         :to="{ name: 'quick-action-bvc' }"
-        class="block text-center text-md font-bold bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white mt-2 px-2 py-3 rounded-md"
+        class="block text-center text-md font-bold 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 mt-2 px-2 py-3 rounded-md"
+      >
+        Bountiful Voluntaryist Community Actions</router-link
       >
-        Bountiful Voluntaryist Community Actions
-      </router-link>
     </div>
 
+    <!-- show the actions for recognizing a give -->
     <div class="mb-8">
       <div v-if="isCreatingIdentifier">
         <p class="text-slate-500 text-center italic mt-4 mb-4">
-          <fa icon="spinner" class="fa-spin-pulse" /> Loading&hellip;
+          <fa icon="spinner" class="fa-spin-pulse"></fa> Loading&hellip;
         </p>
       </div>
+      <div
+        v-if="!activeDid && !isCreatingIdentifier"
+        class="bg-amber-200 rounded-md overflow-hidden text-center px-4 py-3 mb-4"
+      >
+        <p class="text-lg mb-3">
+          Want to connect with your contacts, or share contributions or
+          projects?
+        </p>
+        <router-link
+          :to="{ name: 'start' }"
+          class="block text-center text-md font-bold 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 mt-2 px-2 py-3 rounded-md"
+        >
+          Create An Identifier</router-link
+        >
+      </div>
+
+      <div
+        v-else-if="!isRegistered"
+        class="bg-amber-200 rounded-md overflow-hidden text-center px-4 py-3 mb-4"
+      >
+        Someone must register your identifier before you can record anyone's
+        giving.
+        <router-link
+          :to="{ name: 'contact-qr' }"
+          class="block text-center text-md font-bold 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 mt-2 px-2 py-3 rounded-md"
+        >
+          Show Them Your Identifier Info</router-link
+        >
+        <br />
+        To double-check that you're registered,
+        <br />
+        <router-link :to="{ name: 'account' }" class="text-blue-500">
+          see your Usage Limits on the Account
+          <fa icon="circle-user" /> page.</router-link
+        >
+      </div>
 
       <div v-else>
-        <!-- !isCreatingIdentifier -->
-        <!-- They should have an identifier, even if it's an auto-generated one that they'll never use. -->
+        <!-- activeDid && isRegistered -->
         <div class="mb-4">
-          <div
-            v-if="!isRegistered"
-            id="noticeSomeoneMustRegisterYou"
-            class="bg-amber-200 rounded-md overflow-hidden text-center px-4 py-3 mb-4"
+          <h2 class="text-xl font-bold">Record Something Given By:</h2>
+        </div>
+
+        <ul
+          class="grid grid-cols-4 sm:grid-cols-5 md:grid-cols-6 gap-x-3 gap-y-5 text-center mb-5"
+        >
+          <li @click="openDialog()">
+            <img
+              src="../assets/blank-square.svg"
+              class="mx-auto border border-slate-300 rounded-md mb-1"
+            />
+            <h3
+              class="text-xs italic font-medium text-ellipsis whitespace-nowrap overflow-hidden"
+            >
+              Anonymous/Unnamed
+            </h3>
+          </li>
+          <li
+            v-for="contact in allContacts.slice(0, 7)"
+            :key="contact.did"
+            @click="openDialog(contact)"
           >
-            <!-- activeDid && !isRegistered -->
-            To share, someone must register you.
-            <router-link
-              :to="{ name: 'contact-qr' }"
-              class="block text-center text-md font-bold bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white mt-2 px-2 py-3 rounded-md"
+            <EntityIcon
+              :entityId="contact.did"
+              :iconSize="64"
+              class="mx-auto border border-slate-300 rounded-md mb-1"
+            />
+            <h3
+              class="text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden"
             >
-              Show Them {{ PASSKEYS_ENABLED ? "Default" : "Your" }} Identifier
-              Info
-            </router-link>
-            <div v-if="PASSKEYS_ENABLED" class="flex justify-end w-full">
-              <router-link
-                :to="{ name: 'start' }"
-                class="block text-right text-md font-bold bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white mt-2 px-2 py-3 rounded-md"
-              >
-                See all your options first
-              </router-link>
-            </div>
-          </div>
+              {{ contact.name || contact.did }}
+            </h3>
+          </li>
+        </ul>
 
-          <div v-else id="sectionRecordSomethingGiven">
-            <!-- activeDid && isRegistered -->
-
-            <!-- show the actions for recognizing a give -->
-            <div class="mb-4">
-              <h2 class="text-xl font-bold">Record Something Given By:</h2>
-            </div>
-
-            <ul
-              class="grid grid-cols-4 sm:grid-cols-5 md:grid-cols-6 gap-x-3 gap-y-5 text-center mb-5"
-            >
-              <li @click="openDialog()">
-                <img
-                  src="../assets/blank-square.svg"
-                  class="mx-auto border border-slate-300 rounded-md mb-1"
-                />
-                <h3
-                  class="text-xs italic font-medium text-ellipsis whitespace-nowrap overflow-hidden"
-                >
-                  Unnamed/Unknown
-                </h3>
-              </li>
-              <li
-                v-for="contact in allContacts.slice(0, 7)"
-                :key="contact.did"
-                @click="openDialog(contact)"
-              >
-                <EntityIcon
-                  :contact="contact"
-                  :iconSize="64"
-                  class="mx-auto border border-slate-300 rounded-md mb-1 cursor-pointer"
-                />
-                <h3
-                  class="text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden"
-                >
-                  {{ contact.name || contact.did }}
-                </h3>
-              </li>
-            </ul>
-
-            <div class="flex justify-between">
-              <router-link
-                v-if="allContacts.length >= 7"
-                :to="{ name: 'contact-gift' }"
-                class="block text-center text-md font-bold bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md"
-              >
-                Choose From All Contacts
-              </router-link>
-              <button
-                @click="openGiftedPrompts()"
-                class="block text-center text-md bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-4 py-2 rounded-md"
-              >
-                Ideas...
-              </button>
-            </div>
-          </div>
+        <div class="flex justify-between">
+          <router-link
+            v-if="allContacts.length >= 7"
+            :to="{ name: 'contact-gives' }"
+            class="block text-center text-md font-bold uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md"
+          >
+            Choose From All Contacts
+          </router-link>
+          <button
+            @click="openGiftedPrompts()"
+            class="block text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-4 py-2 rounded-md"
+          >
+            Ideas...
+          </button>
         </div>
       </div>
     </div>
 
-    <GiftedDialog ref="customDialog" />
+    <GiftedDialog
+      ref="customDialog"
+      message="Received from"
+      showGivenToUser="true"
+    />
     <GiftedPrompts ref="giftedPrompts" />
     <FeedFilters ref="feedFilters" />
 
@@ -172,7 +181,7 @@
       <div class="flex items-center mb-4">
         <h2 class="text-xl font-bold">Latest Activity</h2>
         <button @click="openFeedFilters()" class="block text-center ml-auto">
-          <span class="text-sm text-white">
+          <span class="text-sm uppercase text-white">
             <span
               v-if="resultsAreFiltered()"
               class="bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] px-3 py-1.5 rounded-md"
@@ -189,72 +198,31 @@
         </button>
       </div>
       <InfiniteScroll @reached-bottom="loadMoreGives">
-        <ul id="listLatestActivity" class="border-t border-slate-300">
+        <ul class="border-t border-slate-300">
           <li
             class="border-b border-slate-300 py-2"
             v-for="record in feedData"
             :key="record.jwtId"
           >
             <div
-              class="border-b border-dashed border-slate-400 text-orange-400 pb-2 mb-2 font-bold text-sm"
+              class="border-b border-dashed border-slate-400 text-orange-400 pb-2 mb-2 font-bold uppercase text-sm"
               v-if="record.jwtId == feedLastViewedClaimId"
             >
               You've already seen all the following
             </div>
 
             <div class="grid grid-cols-12">
-              <span class="pt-1 col-span-1 justify-self-start">
+              <span class="col-span-1 justify-self-start">
                 <span>
                   <fa
+                    v-if="record.giver.known || record.receiver.known"
                     icon="circle-user"
-                    :class="
-                      computeKnownPersonIconStyleClassNames(
-                        record.giver.known || record.receiver.known,
-                      )
-                    "
-                    @click="toastUser('This involves your contacts.')"
-                  />
-                  <fa
-                    icon="gift"
-                    class="pl-3 text-slate-500"
-                    @click="toastUser('This is a gift.')"
+                    class="pt-1 text-slate-500"
                   />
+                  <fa v-else icon="gift" class="pt-1 pl-3 text-slate-500" />
                 </span>
               </span>
               <span class="col-span-10 justify-self-stretch">
-                <!-- show giver and/or receiver profiles... which seemed like a good idea but actually adds clutter
-                <span
-                  v-if="
-                    record.giver.profileImageUrl ||
-                    record.receiver.profileImageUrl
-                  "
-                >
-                  <EntityIcon
-                    v-if="record.agentDid !== activeDid"
-                    :icon-size="32"
-                    :profile-image-url="record.giver.profileImageUrl"
-                    class="inline-block align-middle border border-slate-300 rounded-md mr-1"
-                  />
-                  <fa
-                    v-if="
-                      record.agentDid !== activeDid &&
-                      record.recipientDid !== activeDid &&
-                      !record.fulfillsPlanHandleId
-                    "
-                    icon="ellipsis"
-                    class="text-slate"
-                  />
-                  <EntityIcon
-                    v-if="
-                      record.recipientDid !== activeDid &&
-                      !record.fulfillsPlanHandleId
-                    "
-                    :iconSize="32"
-                    :profile-image-url="record.receiver.profileImageUrl"
-                    class="inline-block align-middle border border-slate-300 rounded-md ml-1"
-                  />
-                </span>
-                -->
                 <span class="pl-2">
                   {{ giveDescription(record) }}
                 </span>
@@ -262,7 +230,7 @@
                   <fa
                     icon="file-lines"
                     class="pl-2 text-blue-500 cursor-pointer"
-                  />
+                  ></fa>
                 </a>
               </span>
               <span class="col-span-1 justify-self-end">
@@ -273,7 +241,7 @@
                     encodeURIComponent(record.fulfillsPlanHandleId)
                   "
                 >
-                  <fa icon="hammer" class="text-blue-500" />
+                  <fa icon="hammer" class="text-blue-500"></fa>
                 </router-link>
               </span>
             </div>
@@ -287,7 +255,7 @@
       </InfiniteScroll>
       <div v-if="isFeedLoading">
         <p class="text-slate-500 text-center italic mt-4 mb-4">
-          <fa icon="spinner" class="fa-spin-pulse" /> Loading&hellip;
+          <fa icon="spinner" class="fa-spin-pulse"></fa> Loading&hellip;
         </p>
       </div>
       <div v-if="!isFeedLoading && feedData.length === 0">
@@ -300,11 +268,11 @@
 </template>
 
 <script lang="ts">
+import * as R from "ramda";
 import { UAParser } from "ua-parser-js";
+import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
-import App from "../App.vue";
 import EntityIcon from "@/components/EntityIcon.vue";
 import GiftedDialog from "@/components/GiftedDialog.vue";
 import GiftedPrompts from "@/components/GiftedPrompts.vue";
@@ -312,12 +280,9 @@ import FeedFilters from "@/components/FeedFilters.vue";
 import InfiniteScroll from "@/components/InfiniteScroll.vue";
 import QuickNav from "@/components/QuickNav.vue";
 import TopMessage from "@/components/TopMessage.vue";
-import {
-  AppString,
-  NotificationIface,
-  PASSKEYS_ENABLED,
-} from "@/constants/app";
+import { NotificationIface } from "@/constants/app";
 import { db, accountsDB } from "@/db/index";
+import { Account } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
 import {
   BoundingBox,
@@ -325,42 +290,31 @@ import {
   MASTER_SETTINGS_KEY,
   Settings,
 } from "@/db/tables/settings";
+import { accessToken } from "@/libs/crypto";
 import {
   contactForDid,
   containsNonHiddenDid,
   didInfoForContact,
-  fetchEndorserRateLimits,
-  getHeaders,
   getPlanFromCache,
-  GiverReceiverInputInfo,
+  GiverInputInfo,
   GiveSummaryRecord,
 } from "@/libs/endorserServer";
-import {
-  generateSaveAndActivateIdentity,
-  registerSaveAndActivatePasskey,
-} from "@/libs/util";
+import { generateSaveAndActivateIdentity } from "@/libs/util";
 
 interface GiveRecordWithContactInfo extends GiveSummaryRecord {
   giver: {
     displayName: string;
     known: boolean;
-    profileImageUrl?: string;
   };
-  image?: string;
-  recipientProjectName?: string;
+  image: string;
+  recipientProjectName: string | undefined;
   receiver: {
     displayName: string;
     known: boolean;
-    profileImageUrl?: string;
   };
 }
 
 @Component({
-  computed: {
-    App() {
-      return App;
-    },
-  },
   components: {
     GiftedDialog,
     GiftedPrompts,
@@ -374,9 +328,6 @@ interface GiveRecordWithContactInfo extends GiveSummaryRecord {
 export default class HomeView extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
 
-  AppString = AppString;
-  PASSKEYS_ENABLED = PASSKEYS_ENABLED;
-
   activeDid = "";
   allContacts: Array<Contact> = [];
   allMyDids: Array<string> = [];
@@ -384,7 +335,6 @@ export default class HomeView extends Vue {
   feedData: GiveRecordWithContactInfo[] = [];
   feedPreviousOldestId?: string;
   feedLastViewedClaimId?: string;
-  givenName = "";
   isAnyFeedFilterOn: boolean;
   isCreatingIdentifier = false;
   isFeedFilteredByVisible = false;
@@ -398,18 +348,30 @@ export default class HomeView extends Vue {
   showShortcutBvc = false;
   userAgentInfo = new UAParser(); // see https://docs.uaparser.js.org/v2/api/ua-parser-js/get-os.html
 
+  public async getIdentity(activeDid: string) {
+    await accountsDB.open();
+    const account = (await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first()) as Account;
+    const identity = JSON.parse(account?.identity || "null");
+    return identity; // may be null
+  }
+
+  public async getHeaders(identity: IIdentifier) {
+    const token = await accessToken(identity);
+    const headers = {
+      "Content-Type": "application/json",
+      Authorization: "Bearer " + token,
+    };
+    return headers;
+  }
+
   async mounted() {
     try {
       await accountsDB.open();
       const allAccounts = await accountsDB.accounts.toArray();
-      if (allAccounts.length > 0) {
-        this.allMyDids = allAccounts.map((acc) => acc.did);
-      } else {
-        this.isCreatingIdentifier = true;
-        const newDid = await generateSaveAndActivateIdentity();
-        this.isCreatingIdentifier = false;
-        this.allMyDids = [newDid];
-      }
+      this.allMyDids = allAccounts.map((acc) => acc.did);
 
       await db.open();
       const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
@@ -417,7 +379,6 @@ export default class HomeView extends Vue {
       this.activeDid = settings?.activeDid || "";
       this.allContacts = await db.contacts.toArray();
       this.feedLastViewedClaimId = settings?.lastViewedClaimId;
-      this.givenName = settings?.firstName || "";
       this.isFeedFilteredByVisible = !!settings?.filterFeedByVisible;
       this.isFeedFilteredByNearby = !!settings?.filterFeedByNearby;
       this.isRegistered = !!settings?.isRegistered;
@@ -426,28 +387,15 @@ export default class HomeView extends Vue {
 
       this.isAnyFeedFilterOn = isAnyFeedFilterOn(settings);
 
-      // someone may have have registered after sharing contact info, so recheck
-      if (!this.isRegistered && this.activeDid) {
-        try {
-          const resp = await fetchEndorserRateLimits(
-            this.apiServer,
-            this.axios,
-            this.activeDid,
-          );
-          if (resp.status === 200) {
-            // we just needed to know that they're registered
-            await db.open();
-            await db.settings.update(MASTER_SETTINGS_KEY, {
-              isRegistered: true,
-            });
-            this.isRegistered = true;
-          }
-        } catch (e) {
-          // ignore the error... just keep us unregistered
-        }
+      if (this.allMyDids.length === 0) {
+        this.isCreatingIdentifier = true;
+        this.activeDid = await generateSaveAndActivateIdentity();
+        this.allMyDids = [this.activeDid];
+        this.isCreatingIdentifier = false;
       }
 
       // this returns a Promise but we don't need to wait for it
+
       await this.updateAllFeed();
 
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -467,15 +415,6 @@ export default class HomeView extends Vue {
     }
   }
 
-  async generatePasskeyIdentifier() {
-    this.isCreatingIdentifier = true;
-    const account = await registerSaveAndActivatePasskey(
-      AppString.APP_NAME + (this.givenName ? " - " + this.givenName : ""),
-    );
-    this.activeDid = account.did;
-    this.allMyDids = this.allMyDids.concat(this.activeDid);
-    this.isCreatingIdentifier = false;
-  }
   resultsAreFiltered() {
     return this.isFeedFilteredByVisible || this.isFeedFilteredByNearby;
   }
@@ -484,6 +423,26 @@ export default class HomeView extends Vue {
     return "Notification" in window;
   }
 
+  public async buildHeaders() {
+    const headers: HeadersInit = {
+      "Content-Type": "application/json",
+    };
+
+    const identity = await this.getIdentity(this.activeDid);
+    if (this.activeDid) {
+      if (identity) {
+        headers["Authorization"] = "Bearer " + (await accessToken(identity));
+      } else {
+        throw new Error(
+          "An ID is chosen but there are no keys for it so it cannot be used to talk with the service. Switch your ID.",
+        );
+      }
+    } else {
+      // it's OK without auth... we just won't get any identifiers
+    }
+    return headers;
+  }
+
   // only called when a setting was changed
   async reloadFeedOnChange() {
     await db.open();
@@ -501,11 +460,8 @@ export default class HomeView extends Vue {
    * Data loader used by infinite scroller
    * @param payload is the flag from the InfiniteScroll indicating if it should load
    **/
-  async loadMoreGives(payload: boolean) {
-    // Since feed now loads projects along the way, it takes longer
-    // and the InfiniteScroll component triggers a load before finished.
-    // One alternative is to totally separate the project link loading.
-    if (payload && !this.isFeedLoading) {
+  public async loadMoreGives(payload: boolean) {
+    if (payload) {
       this.updateAllFeed();
     }
   }
@@ -523,7 +479,7 @@ export default class HomeView extends Vue {
     }
   }
 
-  async updateAllFeed() {
+  public async updateAllFeed() {
     this.isFeedLoading = true;
     let endOfResults = true;
     await this.retrieveGives(this.apiServer, this.feedPreviousOldestId)
@@ -531,66 +487,71 @@ export default class HomeView extends Vue {
         if (results.data.length > 0) {
           endOfResults = false;
           // include the descriptions of the giver and receiver
-          for (const record: GiveSummaryRecord of results.data) {
-            // similar code is in endorser-mobile utility.ts
-            // claim.claim happen for some claims wrapped in a Verifiable Credential
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            const claim = (record.fullClaim as any).claim || record.fullClaim;
-            // agent.did is for legacy data, before March 2023
-            const giverDid =
-              claim.agent?.identifier || (claim.agent as any)?.did; // eslint-disable-line @typescript-eslint/no-explicit-any
-            // recipient.did is for legacy data, before March 2023
-            const recipientDid =
-              claim.recipient?.identifier || (claim.recipient as any)?.did; // eslint-disable-line @typescript-eslint/no-explicit-any
+          const identity = await this.getIdentity(this.activeDid);
+          const newFeedData: Array<Promise<GiveRecordWithContactInfo>> =
+            results.data.map(async (record: GiveSummaryRecord) => {
+              // similar code is in endorser-mobile utility.ts
+              // claim.claim happen for some claims wrapped in a Verifiable Credential
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
+              const claim = (record.fullClaim as any).claim || record.fullClaim;
+              // agent.did is for legacy data, before March 2023
+              const giverDid =
+                claim.agent?.identifier || (claim.agent as any)?.did; // eslint-disable-line @typescript-eslint/no-explicit-any
+              // recipient.did is for legacy data, before March 2023
+              const recipientDid =
+                claim.recipient?.identifier || (claim.recipient as any)?.did; // eslint-disable-line @typescript-eslint/no-explicit-any
+              const plan = await getPlanFromCache(
+                record.fulfillsPlanHandleId,
+                identity,
+                this.axios,
+                this.apiServer,
+              );
 
-            // This has indeed proven problematic. See loadMoreGives
-            // We should display it immediately and then get the plan later.
-            const plan = await getPlanFromCache(
-              record.fulfillsPlanHandleId,
-              this.axios,
-              this.apiServer,
-              this.activeDid,
-            );
-
-            // check if the record should be filtered out
-            let anyMatch = false;
-            if (this.isFeedFilteredByVisible && containsNonHiddenDid(record)) {
-              // has a visible DID so it's a keeper
-              anyMatch = true;
-            }
-            if (!anyMatch && this.isFeedFilteredByNearby) {
-              // check if the associated project has a location inside user's search box
-              if (record.fulfillsPlanHandleId) {
-                if (plan?.locLat && plan?.locLon) {
-                  if (this.latLongInAnySearchBox(plan.locLat, plan.locLon)) {
-                    anyMatch = true;
+              // check if the record should be filtered out
+              let anyMatch = false;
+              if (
+                this.isFeedFilteredByVisible &&
+                containsNonHiddenDid(record)
+              ) {
+                // has a visible DID so it's a keeper
+                anyMatch = true;
+              }
+              if (!anyMatch && this.isFeedFilteredByNearby) {
+                // check if the associated project has a location inside user's search box
+                if (record.fulfillsPlanHandleId) {
+                  if (plan?.locLat && plan?.locLon) {
+                    if (this.latLongInAnySearchBox(plan.locLat, plan.locLon)) {
+                      anyMatch = true;
+                    }
                   }
                 }
               }
-            }
-            if (this.isAnyFeedFilterOn && !anyMatch) {
-              continue;
-            }
+              if (this.isAnyFeedFilterOn && !anyMatch) {
+                return null;
+              }
 
-            const newRecord: GiveRecordWithContactInfo = {
-              ...record,
-              giver: didInfoForContact(
-                giverDid,
-                this.activeDid,
-                contactForDid(giverDid, this.allContacts),
-                this.allMyDids,
-              ),
-              image: claim.image,
-              recipientProjectName: plan?.name as string,
-              receiver: didInfoForContact(
-                recipientDid,
-                this.activeDid,
-                contactForDid(recipientDid, this.allContacts),
-                this.allMyDids,
-              ),
-            };
-            this.feedData.push(newRecord);
-          }
+              return {
+                ...record,
+                giver: didInfoForContact(
+                  giverDid,
+                  this.activeDid,
+                  contactForDid(giverDid, this.allContacts),
+                  this.allMyDids,
+                ),
+                image: claim.image,
+                recipientProjectName: plan?.name,
+                receiver: didInfoForContact(
+                  recipientDid,
+                  this.activeDid,
+                  contactForDid(recipientDid, this.allContacts),
+                  this.allMyDids,
+                ),
+              };
+            });
+          const allNewFeedData: GiveRecordWithContactInfo[] =
+            await Promise.all(newFeedData);
+          const filteredFeedData = allNewFeedData.filter(R.isNotNil);
+          this.feedData = this.feedData.concat(filteredFeedData);
           this.feedPreviousOldestId =
             results.data[results.data.length - 1].jwtId;
           // The following update is only done on the first load.
@@ -599,7 +560,7 @@ export default class HomeView extends Vue {
             this.feedLastViewedClaimId < results.data[0].jwtId
           ) {
             await db.open();
-            await db.settings.update(MASTER_SETTINGS_KEY, {
+            db.settings.update(MASTER_SETTINGS_KEY, {
               lastViewedClaimId: results.data[0].jwtId,
             });
           }
@@ -630,15 +591,15 @@ export default class HomeView extends Vue {
    * @param beforeId the earliest ID (of previous searches) to search earlier
    * @return claims in reverse chronological order
    */
-  async retrieveGives(endorserApiServer: string, beforeId?: string) {
+  public async retrieveGives(endorserApiServer: string, beforeId?: string) {
     const beforeQuery = beforeId == null ? "" : "&beforeId=" + beforeId;
     const response = await fetch(
       endorserApiServer +
-        "/api/v2/report/gives?giftNotTrade=true" +
+        "/api/v2/report/gives?giftNotTrade=true&" +
         beforeQuery,
       {
         method: "GET",
-        headers: await getHeaders(this.activeDid),
+        headers: await this.buildHeaders(),
       },
     );
 
@@ -723,7 +684,7 @@ export default class HomeView extends Vue {
     const route = {
       path: "/claim/" + encodeURIComponent(jwtId),
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   displayAmount(code: string, amt: number) {
@@ -734,16 +695,8 @@ export default class HomeView extends Vue {
     return unitCode === "HUR" ? (single ? "hour" : "hours") : unitCode;
   }
 
-  openDialog(giver?: GiverReceiverInputInfo) {
-    (this.$refs.customDialog as GiftedDialog).open(
-      giver,
-      {
-        did: this.activeDid,
-        name: "you",
-      },
-      undefined,
-      "Given by " + (giver?.name || "someone not named"),
-    );
+  openDialog(giver?: GiverInputInfo) {
+    (this.$refs.customDialog as GiftedDialog).open(giver);
   }
 
   openGiftedPrompts() {
@@ -753,21 +706,5 @@ export default class HomeView extends Vue {
   openFeedFilters() {
     (this.$refs.feedFilters as FeedFilters).open(this.reloadFeedOnChange);
   }
-
-  toastUser(message) {
-    this.$notify(
-      {
-        group: "alert",
-        type: "toast",
-        title: "FYI",
-        text: message,
-      },
-      2000,
-    );
-  }
-
-  computeKnownPersonIconStyleClassNames(known: boolean) {
-    return known ? "text-slate-500" : "text-slate-100";
-  }
 }
 </script>

src/views/IdentitySwitcherView.vue

@@ -39,43 +39,24 @@
 
     <!-- Other Identity/ies -->
     <ul class="mb-4">
-      <li v-for="ident in otherIdentities" :key="ident.did">
-        <div class="flex items-center justify-between mb-2">
-          <div
-            class="flex flex-grow items-center bg-slate-100 rounded-md px-4 py-3 mb-2 truncate cursor-pointer"
-            @click="switchAccount(ident.did)"
-          >
-            <fa
-              v-if="ident.did === activeDid"
-              icon="circle-check"
-              class="fa-fw text-blue-600 text-xl mr-3"
-            />
-            <fa
-              v-else
-              icon="circle"
-              class="fa-fw text-slate-400 text-xl mr-3"
-            />
-            <span class="flex-grow overflow-hidden">
-              <div class="text-sm text-slate-500 truncate">
-                <b>ID:</b> <code>{{ ident.did }}</code>
-              </div>
-            </span>
+      <li
+        class="block bg-slate-100 rounded-md flex items-center px-4 py-3 mb-2"
+        v-for="ident in otherIdentities"
+        :key="ident.did"
+        @click="switchAccount(ident.did)"
+      >
+        <fa
+          v-if="ident.did === activeDid"
+          icon="circle-check"
+          class="fa-fw text-blue-600 text-xl mr-3"
+        />
+        <fa v-else icon="circle" class="fa-fw text-slate-400 text-xl mr-3" />
+        <span class="overflow-hidden">
+          <h2 class="text-xl font-semibold mb-0"></h2>
+          <div class="text-sm text-slate-500 truncate">
+            <b>ID:</b> <code>{{ ident.did }}</code>
           </div>
-          <div>
-            <fa
-              v-if="ident.did === activeDid"
-              icon="trash-can"
-              class="text-slate-400 text-xl ml-2 mr-2 cursor-pointer"
-              @click="notifyCannotDelete()"
-            />
-            <fa
-              v-else
-              icon="trash-can"
-              class="text-red-600 text-xl ml-2 mr-2 cursor-pointer"
-              @click="deleteAccount(ident.id)"
-            />
-          </div>
-        </div>
+        </span>
       </li>
     </ul>
 
@@ -99,10 +80,10 @@
 </template>
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
-import { NotificationIface } from "@/constants/app";
+import { AppString, NotificationIface } from "@/constants/app";
 import { db, accountsDB } from "@/db/index";
+import { AccountsSchema } from "@/db/tables/accounts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import QuickNav from "@/components/QuickNav.vue";
 
@@ -110,11 +91,14 @@ import QuickNav from "@/components/QuickNav.vue";
 export default class IdentitySwitcherView extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
 
+  Constants = AppString;
+  public accounts: typeof AccountsSchema;
   public activeDid = "";
   public activeDidInIdentities = false;
   public apiServer = "";
   public apiServerInput = "";
-  public otherIdentities: Array<{ id: string; did: string }> = [];
+  public otherIdentities: Array<{ did: string }> = [];
+  public showContactGives = false;
 
   async created() {
     try {
@@ -123,13 +107,14 @@ export default class IdentitySwitcherView extends Vue {
       this.activeDid = settings?.activeDid || "";
       this.apiServer = settings?.apiServer || "";
       this.apiServerInput = settings?.apiServer || "";
+      this.showContactGives = !!settings?.showContactGivesInline;
 
       await accountsDB.open();
       const accounts = await accountsDB.accounts.toArray();
       for (let n = 0; n < accounts.length; n++) {
-        const acct = accounts[n];
-        this.otherIdentities.push({ id: acct.id as string, did: acct.did });
-        if (acct.did && this.activeDid === acct.did) {
+        const did = JSON.parse(accounts[n].identity)["did"];
+        this.otherIdentities.push({ did: did });
+        if (did && this.activeDid === did) {
           this.activeDidInIdentities = true;
         }
       }
@@ -156,38 +141,7 @@ export default class IdentitySwitcherView extends Vue {
     await db.settings.update(MASTER_SETTINGS_KEY, {
       activeDid: did,
     });
-    (this.$router as Router).push({ name: "account" });
-  }
-
-  async deleteAccount(id: string) {
-    this.$notify(
-      {
-        group: "modal",
-        type: "confirm",
-        title: "Delete Identity?",
-        text: "Are you sure you want to erase this identity? (There is no undo. You may want to select it and back it up just in case.)",
-        onYes: async () => {
-          await accountsDB.open();
-          await accountsDB.accounts.delete(id);
-          this.otherIdentities = this.otherIdentities.filter(
-            (ident) => ident.id !== id,
-          );
-        },
-      },
-      -1,
-    );
-  }
-
-  notifyCannotDelete() {
-    this.$notify(
-      {
-        group: "alert",
-        type: "warning",
-        title: "Cannot Delete",
-        text: "You cannot delete the active identity.",
-      },
-      3000,
-    );
+    this.$router.push({ name: "account" });
   }
 }
 </script>

src/views/ImportAccountView.vue

@@ -18,7 +18,7 @@
       Enter your seed phrase below to import your identifier on this device.
     </p>
     <!-- id used by puppeteer test script -->
-    <textarea
+    <input
       id="seed-input"
       type="text"
       placeholder="Seed Phrase"
@@ -77,7 +77,6 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
@@ -111,7 +110,7 @@ export default class ImportAccountView extends Vue {
   }
 
   public onCancelClick() {
-    (this.$router as Router).back();
+    this.$router.back();
   }
 
   public async fromMnemonic() {
@@ -144,10 +143,10 @@ export default class ImportAccountView extends Vue {
 
       // record that as the active DID
       await db.open();
-      await db.settings.update(MASTER_SETTINGS_KEY, {
+      db.settings.update(MASTER_SETTINGS_KEY, {
         activeDid: newId.did,
       });
-      (this.$router as Router).push({ name: "account" });
+      this.$router.push({ name: "account" });
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
       console.error("Error saving mnemonic & updating settings:", err);

src/views/ImportDerivedAccountView.vue

@@ -17,7 +17,7 @@
 
     <div>
       <p class="text-center text-xl mb-4 font-light">
-        Will increment the maximum known derivation path from the existing seed.
+        Will increment the maximum derivation path from the existing seed.
       </p>
 
       <p v-if="didArrays.length > 1">
@@ -70,14 +70,12 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
-
 import {
   DEFAULT_ROOT_DERIVATION_PATH,
   deriveAddress,
   newIdentifier,
   nextDerivationPath,
-} from "@/libs/crypto";
+} from "../libs/crypto";
 import { accountsDB, db } from "@/db/index";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 
@@ -102,7 +100,7 @@ export default class ImportAccountView extends Vue {
   }
 
   public onCancelClick() {
-    (this.$router as Router).back();
+    this.$router.back();
   }
 
   public switchAccount(did: string) {
@@ -126,11 +124,9 @@ export default class ImportAccountView extends Vue {
       }
     });
     // increment the last number in that max derivation path
-    const newDerivPath = nextDerivationPath(
-      accountWithMaxDeriv.derivationPath as string,
-    );
+    const newDerivPath = nextDerivationPath(accountWithMaxDeriv.derivationPath);
 
-    const mne: string = accountWithMaxDeriv.mnemonic as string;
+    const mne: string = accountWithMaxDeriv.mnemonic;
 
     const [address, privateHex, publicHex] = deriveAddress(mne, newDerivPath);
 
@@ -148,10 +144,10 @@ export default class ImportAccountView extends Vue {
 
       // record that as the active DID
       await db.open();
-      await db.settings.update(MASTER_SETTINGS_KEY, {
+      db.settings.update(MASTER_SETTINGS_KEY, {
         activeDid: newId.did,
       });
-      (this.$router as Router).push({ name: "account" });
+      this.$router.push({ name: "account" });
     } catch (err) {
       console.error("Error saving mnemonic & updating settings:", err);
     }

src/views/NewEditAccountView.vue

@@ -33,7 +33,7 @@
         <!-- SHOW ME instead while processing saving changes -->
         <button
           type="button"
-          class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md mb-2"
+          class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
           @click="onClickCancel()"
         >
           Cancel
@@ -45,8 +45,6 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
-
 import { db } from "@/db/index";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 
@@ -65,16 +63,18 @@ export default class NewEditAccountView extends Vue {
       (settings?.lastName ? ` ${settings.lastName}` : ""); // deprecated, pre v 0.1.3
   }
 
-  async onClickSaveChanges() {
-    await db.settings.update(MASTER_SETTINGS_KEY, {
+  onClickSaveChanges() {
+    db.settings.update(MASTER_SETTINGS_KEY, {
       firstName: this.givenName,
       lastName: "", // deprecated, pre v 0.1.3
     });
-    (this.$router as Router).back();
+    localStorage.setItem("firstName", this.givenName as string);
+    localStorage.setItem("lastName", ""); // deprecated, pre v 0.1.3
+    this.$router.back();
   }
 
   onClickCancel() {
-    (this.$router as Router).back();
+    this.$router.back();
   }
 }
 </script>

src/views/NewEditProjectView.vue

@@ -29,31 +29,10 @@
       v-model="fullClaim.name"
     />
 
-    <div class="flex justify-center mt-4">
-      <span v-if="imageUrl" class="flex justify-between">
-        <a :href="imageUrl" target="_blank" class="text-blue-500 ml-4">
-          <img :src="imageUrl" class="h-24 rounded-xl" />
-        </a>
-        <fa
-          icon="trash-can"
-          @click="confirmDeleteImage"
-          class="text-red-500 fa-fw ml-8 mt-10"
-        />
-      </span>
-      <span v-else>
-        <fa
-          icon="camera"
-          class="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-2 py-2 rounded-md"
-          @click="openImageDialog"
-        />
-      </span>
-    </div>
-    <ImageMethodDialog ref="imageDialog" />
-
     <input
       type="text"
       placeholder="Other Authorized Representative"
-      class="mt-4 block w-full rounded border border-slate-400 px-3 py-2"
+      class="block w-full rounded border border-slate-400 px-3 py-2"
       v-model="agentDid"
     />
     <div class="mb-4">
@@ -74,9 +53,6 @@
       v-model="fullClaim.description"
       maxlength="5000"
     ></textarea>
-    <div class="text-xs text-slate-500 italic -mt-3 mb-4">
-      If you want to be contacted, be sure to include your contact information.
-    </div>
     <div class="text-xs text-slate-500 italic -mt-3 mb-4">
       {{ fullClaim.description?.length }}/5000 max. characters
     </div>
@@ -88,23 +64,6 @@
       class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
     />
 
-    <div class="flex mb-4 columns-3 w-full">
-      <input
-        v-model="startDateInput"
-        placeholder="Start Date"
-        type="date"
-        class="col-span-1 w-full rounded border border-slate-400 px-3 py-2"
-      />
-      <input
-        :disabled="!startDateInput"
-        placeholder="Start Time"
-        v-model="startTimeInput"
-        type="time"
-        class="col-span-1 w-full rounded border border-slate-400 ml-2 px-3 py-2"
-      />
-      <span class="col-span-1 w-full flex justify-center">{{ zoneName }}</span>
-    </div>
-
     <div class="flex items-center mb-4">
       <input
         type="checkbox"
@@ -140,7 +99,7 @@
         <l-marker
           v-if="latitude && longitude"
           :lat-lng="[latitude, longitude]"
-          @click="confirmEraseLatLong()"
+          @click="maybeEraseLatLong()"
         />
       </l-map>
     </div>
@@ -176,35 +135,25 @@
 
 <script lang="ts">
 import "leaflet/dist/leaflet.css";
-import { AxiosError, AxiosRequestHeaders } from "axios";
-import { DateTime } from "luxon";
+import { AxiosError } from "axios";
+import * as didJwt from "did-jwt";
 import { Component, Vue } from "vue-facing-decorator";
 import { LMap, LMarker, LTileLayer } from "@vue-leaflet/vue-leaflet";
-import { Router } from "vue-router";
 
-import ImageMethodDialog from "@/components/ImageMethodDialog.vue";
 import QuickNav from "@/components/QuickNav.vue";
-import { DEFAULT_IMAGE_API_SERVER, NotificationIface } from "@/constants/app";
+import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import {
-  createEndorserJwtVcFromClaim,
-  getHeaders,
-  PlanVerifiableCredential,
-} from "@/libs/endorserServer";
+import { accessToken, SimpleSigner } from "@/libs/crypto";
 import { useAppStore } from "@/store/app";
+import { IIdentifier } from "@veramo/core";
+import { PlanVerifiableCredential } from "@/libs/endorserServer";
 
 @Component({
-  components: { ImageMethodDialog, LMap, LMarker, LTileLayer, QuickNav },
+  components: { LMap, LMarker, LTileLayer, QuickNav },
 })
 export default class NewEditProjectView extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
-  errNote(message) {
-    this.$notify(
-      { group: "alert", type: "danger", title: "Error", text: message },
-      5000,
-    );
-  }
 
   activeDid = "";
   agentDid = "";
@@ -216,7 +165,6 @@ export default class NewEditProjectView extends Vue {
     name: "",
     description: "",
   }; // this default is only to avoid errors before plan is loaded
-  imageUrl = "";
   includeLocation = false;
   isHiddenSave = false;
   isHiddenSpinner = true;
@@ -226,15 +174,39 @@ export default class NewEditProjectView extends Vue {
   numAccounts = 0;
   projectId = localStorage.getItem("projectId") || "";
   projectIssuerDid = "";
-  startDateInput?: string;
-  startTimeInput?: string;
-  zoneName = DateTime.local().zoneName;
   zoom = 2;
 
-  async mounted() {
+  async beforeCreate() {
     await accountsDB.open();
     this.numAccounts = await accountsDB.accounts.count();
+  }
 
+  public async getIdentity(activeDid: string) {
+    await accountsDB.open();
+    const account = await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first();
+    const identity = JSON.parse((account?.identity as string) || "null");
+
+    if (!identity) {
+      throw new Error(
+        "Attempted to load project records with no identifier available.",
+      );
+    }
+    return identity;
+  }
+
+  public async getHeaders(identity: IIdentifier) {
+    const token = await accessToken(identity);
+    const headers = {
+      "Content-Type": "application/json",
+      Authorization: "Bearer " + token,
+    };
+    return headers;
+  }
+
+  async created() {
     await db.open();
     const settings = await db.settings.get(MASTER_SETTINGS_KEY);
     this.activeDid = (settings?.activeDid as string) || "";
@@ -242,26 +214,35 @@ export default class NewEditProjectView extends Vue {
 
     if (this.projectId) {
       if (this.numAccounts === 0) {
-        this.errNote("There was a problem loading your account info.");
+        console.error("Error: no account was found.");
       } else {
-        this.loadProject(this.activeDid);
+        const identity = await this.getIdentity(this.activeDid);
+        if (!identity) {
+          throw new Error(
+            "An ID is chosen but there are no keys for it so it cannot be used to talk with the service. Switch your ID.",
+          );
+        }
+        this.loadProject(identity);
       }
     }
   }
 
-  async loadProject(userDid: string) {
+  async loadProject(identity: IIdentifier) {
     const url =
       this.apiServer +
       "/api/claim/byHandle/" +
       encodeURIComponent(this.projectId);
-    const headers = await getHeaders(userDid);
+    const token = await accessToken(identity);
+    const headers = {
+      "Content-Type": "application/json",
+      Authorization: "Bearer " + token,
+    };
 
     try {
       const resp = await this.axios.get(url, { headers });
       if (resp.status === 200) {
         this.projectIssuerDid = resp.data.issuer;
         this.fullClaim = resp.data.claim;
-        this.imageUrl = resp.data.claim.image || "";
         this.lastClaimJwtId = resp.data.id;
         if (this.fullClaim?.location) {
           this.includeLocation = true;
@@ -271,93 +252,13 @@ export default class NewEditProjectView extends Vue {
         if (this.fullClaim?.agent?.identifier) {
           this.agentDid = this.fullClaim.agent.identifier;
         }
-        if (this.fullClaim.startTime) {
-          const localDateTime = DateTime.fromISO(
-            this.fullClaim.startTime as string,
-          ).toLocal();
-          this.startDateInput = localDateTime.toFormat("yyyy-MM-dd");
-          this.startTimeInput = localDateTime.toFormat("HH:mm");
-        }
       }
     } catch (error) {
       console.error("Got error retrieving that project", error);
-      this.errNote("There was an error retrieving that project.");
     }
   }
 
-  openImageDialog() {
-    (this.$refs.imageDialog as ImageMethodDialog).open((imgUrl) => {
-      this.imageUrl = imgUrl;
-    }, "PlanAction");
-  }
-
-  confirmDeleteImage() {
-    this.$notify(
-      {
-        group: "modal",
-        type: "confirm",
-        title: "Are you sure you want to delete the image?",
-        text: "",
-        onYes: this.deleteImage,
-      },
-      -1,
-    );
-  }
-
-  async deleteImage() {
-    if (!this.imageUrl) {
-      return;
-    }
-    try {
-      const headers = (await getHeaders(this.activeDid)) as AxiosRequestHeaders;
-      const response = await this.axios.delete(
-        DEFAULT_IMAGE_API_SERVER +
-          "/image/" +
-          encodeURIComponent(this.imageUrl),
-        { headers },
-      );
-      if (response.status === 204) {
-        // don't bother with a notification
-        // (either they'll simply continue or they're canceling and going back)
-      } else {
-        console.error("Problem deleting image:", response);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "There was a problem deleting the image.",
-          },
-          5000,
-        );
-        return;
-      }
-
-      this.imageUrl = "";
-    } catch (error) {
-      console.error("Error deleting image:", error);
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      if ((error as any).response.status === 404) {
-        console.log("The image was already deleted:", error);
-
-        this.imageUrl = "";
-
-        // it already doesn't exist so we won't say anything to the user
-      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "There was an error deleting the image.",
-          },
-          5000,
-        );
-      }
-    }
-  }
-
-  private async saveProject(issuerDid: string) {
+  private async saveProject(identity: IIdentifier) {
     // Make a claim
     const vcClaim: PlanVerifiableCredential = this.fullClaim;
     if (this.projectId) {
@@ -370,11 +271,6 @@ export default class NewEditProjectView extends Vue {
     } else {
       delete vcClaim.agent;
     }
-    if (this.imageUrl) {
-      vcClaim.image = this.imageUrl;
-    } else {
-      delete vcClaim.image;
-    }
     if (this.includeLocation) {
       vcClaim.location = {
         geo: {
@@ -386,106 +282,110 @@ export default class NewEditProjectView extends Vue {
     } else {
       delete vcClaim.location;
     }
-    if (this.startDateInput) {
+    // Make a payload for the claim
+    const vcPayload = {
+      vc: {
+        "@context": ["https://www.w3.org/2018/credentials/v1"],
+        type: ["VerifiableCredential"],
+        credentialSubject: vcClaim,
+      },
+    };
+    // create a signature using private key of identity
+    if (identity.keys[0].privateKeyHex != null) {
+      const privateKeyHex: string = identity.keys[0].privateKeyHex;
+      const signer = await SimpleSigner(privateKeyHex);
+      const alg = undefined;
+      // create a JWT for the request
+      const vcJwt: string = await didJwt.createJWT(vcPayload, {
+        alg: alg,
+        issuer: identity.did,
+        signer: signer,
+      });
+
+      // Make the xhr request payload
+
+      const payload = JSON.stringify({ jwtEncoded: vcJwt });
+      const url = this.apiServer + "/api/v2/claim";
+      const token = await accessToken(identity);
+      const headers = {
+        "Content-Type": "application/json",
+        Authorization: "Bearer " + token,
+      };
+
       try {
-        const startTimeFull = this.startTimeInput || "00:00:00";
-        const fullTimeString = this.startDateInput + " " + startTimeFull;
-        // throw an error on an invalid date or time string
-        vcClaim.startTime = new Date(fullTimeString).toISOString(); // ensure timezone is part of it
-      } catch {
-        // it's not a valid date so erase it and tell the user
-        delete vcClaim.startTime;
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "The date was invalid so it was not set.",
-          },
-          5000,
-        );
-      }
-    } else {
-      delete vcClaim.startTime;
-    }
-    const vcJwt = await createEndorserJwtVcFromClaim(issuerDid, vcClaim);
+        const resp = await this.axios.post(url, payload, { headers });
+        if (resp.data?.success?.handleId) {
+          this.errorMessage = "";
 
-    // Make the xhr request payload
-
-    const payload = JSON.stringify({ jwtEncoded: vcJwt });
-    const url = this.apiServer + "/api/v2/claim";
-    const headers = await getHeaders(issuerDid);
-
-    try {
-      const resp = await this.axios.post(url, payload, { headers });
-      if (resp.data?.success?.handleId) {
-        this.errorMessage = "";
-
-        useAppStore()
-          .setProjectId(resp.data.success.handleId)
-          .then(() => {
-            (this.$router as Router).push({ name: "project" });
-          });
-      } else {
-        console.error(
-          "Got unexpected 'data' inside response from server",
-          resp,
-        );
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error Saving Idea",
-            text: "Server did not save the idea. Try again.",
-          },
-          -1,
-        );
-      }
-    } catch (error) {
-      let userMessage = "There was an error saving the project.";
-      const serverError = error as AxiosError<{
-        error?: { message?: string };
-      }>;
-      if (serverError) {
-        console.error("Got error from server", serverError);
-        if (Object.prototype.hasOwnProperty.call(serverError, "message")) {
-          userMessage =
-            (serverError.response?.data?.error?.message as string) ||
-            userMessage;
-          this.$notify(
-            {
-              group: "alert",
-              type: "danger",
-              title: "User Message",
-              text: userMessage,
-            },
-            -1,
-          );
+          useAppStore()
+            .setProjectId(resp.data.success.handleId)
+            .then(() => {
+              this.$router.push({ name: "project" });
+            });
         } else {
+          console.error(
+            "Got unexpected 'data' inside response from server",
+            resp,
+          );
           this.$notify(
             {
               group: "alert",
               type: "danger",
-              title: "Server Message",
-              text: JSON.stringify(serverError.toJSON()),
+              title: "Error Saving Idea",
+              text: "Server did not save the idea. Try again.",
             },
             -1,
           );
         }
-      } else {
-        console.error("Here's the full error trying to save the claim:", error);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Claim Error",
-            text: error as string,
-          },
-          -1,
-        );
+      } catch (error) {
+        let userMessage = "There was an error saving the project.";
+        const serverError = error as AxiosError<{
+          error?: { message?: string };
+        }>;
+        if (serverError) {
+          console.error("Got error from server", serverError);
+          if (Object.prototype.hasOwnProperty.call(serverError, "message")) {
+            userMessage =
+              (serverError.response?.data?.error?.message as string) ||
+              userMessage;
+            this.$notify(
+              {
+                group: "alert",
+                type: "danger",
+                title: "User Message",
+                text: userMessage,
+              },
+              -1,
+            );
+          } else {
+            this.$notify(
+              {
+                group: "alert",
+                type: "danger",
+                title: "Server Message",
+                text: JSON.stringify(serverError.toJSON()),
+              },
+              -1,
+            );
+          }
+        } else {
+          console.error(
+            "Here's the full error trying to save the claim:",
+            error,
+          );
+          this.$notify(
+            {
+              group: "alert",
+              type: "danger",
+              title: "Claim Error",
+              text: error as string,
+            },
+            -1,
+          );
+        }
+        // Now set that error for the user to see.
+        this.errorMessage = userMessage;
       }
-      // Now set that error for the user to see.
-      this.errorMessage = userMessage;
     }
   }
 
@@ -496,33 +396,21 @@ export default class NewEditProjectView extends Vue {
     if (this.numAccounts === 0) {
       console.error("Error: there is no account.");
     } else {
-      this.saveProject(this.activeDid);
+      const identity = await this.getIdentity(this.activeDid);
+      this.saveProject(identity);
     }
   }
 
-  confirmEraseLatLong() {
-    this.$notify(
-      {
-        group: "modal",
-        type: "confirm",
-        title: "Erase Marker",
-        text: "Are you sure you don't want to mark a location? This will erase the current location.",
-        onYes: async () => {
-          this.eraseLatLong();
-        },
-      },
-      -1,
-    );
-  }
-
-  public eraseLatLong() {
-    this.latitude = 0;
-    this.longitude = 0;
-    this.includeLocation = false;
+  public maybeEraseLatLong() {
+    if (window.confirm("Are you sure you don't want to mark a location?")) {
+      this.latitude = 0;
+      this.longitude = 0;
+      this.includeLocation = false;
+    }
   }
 
   public onCancelClick() {
-    (this.$router as Router).back();
+    this.$router.back();
   }
 }
 </script>

src/views/NewIdentifierView.vue

@@ -54,8 +54,6 @@
 <script lang="ts">
 import "dexie-export-import";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
-
 import { generateSaveAndActivateIdentity } from "@/libs/util";
 import QuickNav from "@/components/QuickNav.vue";
 
@@ -67,7 +65,7 @@ export default class NewIdentifierView extends Vue {
     await generateSaveAndActivateIdentity();
     this.loading = false;
     setTimeout(() => {
-      (this.$router as Router).push({ name: "home" });
+      this.$router.push({ name: "home" });
     }, 1000);
   }
 }

src/views/OfferDetailsView.vue

@@ -1,633 +0,0 @@
-<template>
-  <QuickNav />
-  <TopMessage />
-
-  <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
-    <!-- Back -->
-    <div
-      v-if="!hideBackButton"
-      class="text-lg text-center font-light relative px-7"
-    >
-      <h1
-        class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-        @click="cancelBack()"
-      >
-        <fa icon="chevron-left" class="fa-fw"></fa>
-      </h1>
-    </div>
-
-    <!-- Heading -->
-    <h1 class="text-4xl text-center font-light px-4 mb-4">What Was Offered</h1>
-
-    <h1 class="text-xl font-bold text-center mb-4">
-      <span>
-        Offer to
-        {{
-          offeredToProject
-            ? projectName
-            : offeredToRecipient
-              ? recipientName
-              : "someone unidentified"
-        }}</span
-      >
-    </h1>
-    <textarea
-      class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
-      placeholder="What was offered"
-      v-model="itemDescription"
-      data-testId="itemDescription"
-    />
-    <div class="flex flex-row justify-center">
-      <span
-        class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center text-blue-500 px-2 py-2 w-20"
-        @click="changeUnitCode()"
-      >
-        {{ libsUtil.UNIT_SHORT[unitCode] || unitCode }}
-      </span>
-      <div
-        class="border border-r-0 border-slate-400 bg-slate-200 px-4 py-2"
-        @click="amountInput === '0' ? null : decrement()"
-      >
-        <fa icon="chevron-left" />
-      </div>
-      <input
-        type="number"
-        class="border border-r-0 border-slate-400 px-2 py-2 text-center w-20"
-        v-model="amountInput"
-        data-testId="inputOfferAmount"
-      />
-      <div
-        class="rounded-r border border-slate-400 bg-slate-200 px-4 py-2"
-        @click="increment()"
-      >
-        <fa icon="chevron-right" />
-      </div>
-    </div>
-
-    <div class="flex flex-row mt-2">
-      <span
-        class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center px-2 py-2"
-      >
-        Conditions
-      </span>
-      <textarea
-        class="w-full border border-slate-400 px-3 py-2 rounded-r"
-        placeholder="Prerequisites, other people to include, etc."
-        v-model="conditionDescription"
-      />
-    </div>
-
-    <div class="flex flex-row mt-2">
-      <span
-        class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center px-2 py-2"
-      >
-        {{ validThroughDateInput ? "" : "No" }}&nbsp;Expiration
-      </span>
-      <input
-        v-model="validThroughDateInput"
-        type="date"
-        class="w-full rounded border border-slate-400 px-3 py-2 rounded-r"
-      />
-    </div>
-
-    <div class="h-7 mt-4 flex">
-      <input
-        v-if="projectId && !offeredToRecipient"
-        type="checkbox"
-        class="h-6 w-6 mr-2"
-        v-model="offeredToProject"
-      />
-      <fa
-        v-else
-        icon="square"
-        class="bg-slate-500 text-slate-500 h-5 w-5 px-0.5 py-0.5 mr-2 rounded"
-        @click="notifyUserOfProject()"
-      />
-      <label class="text-sm mt-1">
-        {{
-          projectId
-            ? "This was given to " + projectName
-            : "No project was chosen"
-        }}
-      </label>
-    </div>
-
-    <div class="h-7 mt-4 flex">
-      <input
-        v-if="recipientDid && !offeredToProject"
-        type="checkbox"
-        class="h-6 w-6 mr-2"
-        v-model="offeredToRecipient"
-      />
-      <fa
-        v-else
-        icon="square"
-        class="bg-slate-500 text-slate-500 h-5 w-5 px-0.5 py-0.5 mr-2 rounded"
-        @click="notifyUserOfRecipient()"
-      />
-      <label class="text-sm mt-1">
-        {{
-          recipientDid
-            ? "This was given to " + recipientName
-            : "No recipient was chosen."
-        }}
-      </label>
-    </div>
-
-    <div class="mt-4 flex">
-      <router-link
-        :to="{
-          name: 'claim-add-raw',
-          query: {
-            claim: constructOfferParam(),
-          },
-        }"
-        class="text-blue-500"
-      >
-        Edit & Submit Raw
-      </router-link>
-    </div>
-
-    <p class="text-center mb-2 mt-6 italic">
-      Sign & Send to publish to the world
-      <fa
-        icon="circle-info"
-        class="pl-2 text-blue-500 cursor-pointer"
-        @click="explainData()"
-      />
-    </p>
-    <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
-      <button
-        class="block w-full text-center text-lg font-bold 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-2 py-3 rounded-md"
-        @click="confirm"
-      >
-        Sign &amp; Send
-      </button>
-      <button
-        class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
-        @click="cancel"
-      >
-        Cancel
-      </button>
-    </div>
-  </section>
-</template>
-
-<script lang="ts">
-import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
-
-import QuickNav from "@/components/QuickNav.vue";
-import TopMessage from "@/components/TopMessage.vue";
-import { NotificationIface } from "@/constants/app";
-import { accountsDB, db } from "@/db/index";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
-import {
-  createAndSubmitOffer,
-  didInfo,
-  editAndSubmitOffer,
-  GenericCredWrapper,
-  getPlanFromCache,
-  hydrateOffer,
-  OfferVerifiableCredential,
-} from "@/libs/endorserServer";
-import * as libsUtil from "@/libs/util";
-import { Contact } from "@/db/tables/contacts";
-
-@Component({
-  components: {
-    QuickNav,
-    TopMessage,
-  },
-})
-export default class OfferDetailsView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-
-  activeDid = "";
-  apiServer = "";
-
-  amountInput = "0";
-  conditionDescription = "";
-  itemDescription = "";
-  destinationPathAfter = "";
-  offeredToProject = false;
-  offeredToRecipient = false;
-  offererDid: string | undefined;
-  hideBackButton = false;
-  message = "";
-  offerId = "";
-  prevCredToEdit?: GenericCredWrapper<OfferVerifiableCredential>;
-  projectId = "";
-  projectName = "a project";
-  recipientDid = "";
-  recipientName = "";
-  unitCode = "HUR";
-  validThroughDateInput = "";
-
-  libsUtil = libsUtil;
-
-  async mounted() {
-    try {
-      this.prevCredToEdit = (this.$route as Router).query["prevCredToEdit"]
-        ? (JSON.parse(
-            (this.$route as Router).query["prevCredToEdit"],
-          ) as GenericCredWrapper<OfferVerifiableCredential>)
-        : undefined;
-    } catch (error) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Retrieval Error",
-          text: "The previous record isn't available for editing. If you submit, you'll create a new record.",
-        },
-        6000,
-      );
-    }
-
-    const prevAmount =
-      this.prevCredToEdit?.claim?.includesObject?.amountOfThisGood;
-    this.amountInput =
-      (this.$route as Router).query["amountInput"] ||
-      (prevAmount ? String(prevAmount) : "") ||
-      this.amountInput;
-    this.unitCode = ((this.$route as Router).query["unitCode"] ||
-      this.prevCredToEdit?.claim?.includesObject?.unitCode ||
-      this.unitCode) as string;
-
-    this.conditionDescription =
-      this.prevCredToEdit?.claim?.description || this.conditionDescription;
-    this.itemDescription =
-      (this.$route as Router).query["description"] ||
-      this.prevCredToEdit?.claim?.itemOffered?.description ||
-      this.itemDescription;
-    this.destinationPathAfter = (this.$route as Router).query[
-      "destinationPathAfter"
-    ];
-    this.offererDid = ((this.$route as Router).query["offererDid"] ||
-      this.prevCredToEdit?.claim?.agent?.identifier ||
-      this.offererDid) as string;
-    this.hideBackButton =
-      (this.$route as Router).query["hideBackButton"] === "true";
-    this.message = ((this.$route as Router).query["message"] as string) || "";
-
-    // find any project ID
-    let project;
-    if (
-      this.prevCredToEdit?.claim?.itemOffered?.isPartOf["@type"] ===
-      "PlanAction"
-    ) {
-      project = this.prevCredToEdit?.claim?.itemOffered?.isPartOf;
-    }
-    this.projectId = ((this.$route as Router).query["projectId"] ||
-      project?.identifier ||
-      this.projectId) as string;
-    this.projectName = ((this.$route as Router).query["projectName"] ||
-      project?.name ||
-      this.projectName) as string;
-
-    this.recipientDid = ((this.$route as Router).query["recipientDid"] ||
-      this.prevCredToEdit?.claim?.recipient?.identifier) as string;
-    this.recipientName =
-      ((this.$route as Router).query["recipientName"] as string) || "";
-
-    this.validThroughDateInput =
-      this.prevCredToEdit?.claim?.validThrough || this.validThroughDateInput;
-
-    try {
-      await db.open();
-      const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
-      this.apiServer = settings?.apiServer || "";
-      this.activeDid = settings?.activeDid || "";
-
-      let allContacts: Contact[] = [];
-      let allMyDids: string[] = [];
-      if (this.recipientDid && !this.recipientName) {
-        allContacts = await db.contacts.toArray();
-
-        await accountsDB.open();
-        const allAccounts = await accountsDB.accounts.toArray();
-        allMyDids = allAccounts.map((acc) => acc.did);
-        this.recipientName = didInfo(
-          this.recipientDid,
-          this.activeDid,
-          allMyDids,
-          allContacts,
-        );
-      }
-      // these should be functions but something's wrong with the syntax in the <> conditional
-      this.offeredToProject = !!this.projectId;
-      this.offeredToRecipient = !this.offeredToProject && !!this.recipientDid;
-
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (err: any) {
-      console.error("Error retrieving settings from database:", err);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: err.message || "There was an error retrieving your settings.",
-        },
-        -1,
-      );
-    }
-
-    if (this.projectId && !this.projectName) {
-      // console.log("Getting project name from cache", this.projectId);
-      const project = await getPlanFromCache(
-        this.projectId,
-        this.axios,
-        this.apiServer,
-        this.activeDid,
-      );
-      this.projectName = project?.name
-        ? "the project: " + project.name
-        : "a project";
-    }
-  }
-
-  changeUnitCode() {
-    const units = Object.keys(this.libsUtil.UNIT_SHORT);
-    const index = units.indexOf(this.unitCode);
-    this.unitCode = units[(index + 1) % units.length];
-  }
-
-  increment() {
-    this.amountInput = `${(parseFloat(this.amountInput) || 0) + 1}`;
-  }
-
-  decrement() {
-    this.amountInput = `${Math.max(
-      0,
-      (parseFloat(this.amountInput) || 1) - 1,
-    )}`;
-  }
-
-  cancel() {
-    if (this.destinationPathAfter) {
-      (this.$router as Router).push({ path: this.destinationPathAfter });
-    } else {
-      (this.$router as Router).back();
-    }
-  }
-
-  cancelBack() {
-    (this.$router as Router).back();
-  }
-
-  async confirm() {
-    if (!this.activeDid) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "You must select an identifier before you can record a offer.",
-        },
-        2000,
-      );
-      return;
-    }
-    if (parseFloat(this.amountInput) < 0) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          text: "You may not send a negative number.",
-          title: "",
-        },
-        2000,
-      );
-      return;
-    }
-    if (!this.itemDescription && !parseFloat(this.amountInput)) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: `You must enter a description or some number of ${
-            this.libsUtil.UNIT_LONG[this.unitCode]
-          }.`,
-        },
-        2000,
-      );
-      return;
-    }
-
-    this.$notify(
-      {
-        group: "alert",
-        type: "toast",
-        text: "Recording the give...",
-        title: "",
-      },
-      1000,
-    );
-
-    // this is asynchronous, but we don't need to wait for it to complete
-    await this.recordOffer();
-  }
-
-  notifyUserOfProject() {
-    if (!this.projectId) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "Error",
-          text: "To assign to a project, you must open this page through a project.",
-        },
-        3000,
-      );
-    } else {
-      // must be because offeredToRecipient is true
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "Error",
-          text: "You cannot assign both to a project and to a recipient.",
-        },
-        3000,
-      );
-    }
-  }
-
-  notifyUserOfRecipient() {
-    if (!this.recipientDid) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "Error",
-          text: "To assign to a recipient, you must open this page from a contact.",
-        },
-        3000,
-      );
-    } else {
-      // must be because offeredToProject is true
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "Error",
-          text: "You cannot assign both to a recipient and to a project.",
-        },
-        3000,
-      );
-    }
-  }
-
-  /**
-   *
-   * @param offererDid may be null
-   * @param description may be an empty string
-   * @param amountInput may be 0
-   * @param unitCode may be omitted, defaults to "HUR"
-   */
-  public async recordOffer() {
-    try {
-      const recipientDid = this.offeredToRecipient
-        ? this.recipientDid
-        : undefined;
-      const projectId = this.offeredToProject ? this.projectId : undefined;
-      let result;
-      if (this.prevCredToEdit) {
-        // don't create from a blank one in case some properties were set from a different interface
-        result = await editAndSubmitOffer(
-          this.axios,
-          this.apiServer,
-          this.prevCredToEdit,
-          this.activeDid,
-          this.itemDescription,
-          parseFloat(this.amountInput),
-          this.unitCode,
-          this.conditionDescription,
-          this.validThroughDateInput,
-          recipientDid,
-          projectId,
-        );
-      } else {
-        result = await createAndSubmitOffer(
-          this.axios,
-          this.apiServer,
-          this.activeDid,
-          this.itemDescription,
-          parseFloat(this.amountInput),
-          this.unitCode,
-          this.conditionDescription,
-          this.validThroughDateInput,
-          recipientDid,
-          projectId,
-        );
-      }
-
-      if (result.type === "error" || this.isCreationError(result.response)) {
-        const errorMessage = this.getCreationErrorMessage(result);
-        console.error("Error with give creation result:", result);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: errorMessage || "There was an error creating the give.",
-          },
-          -1,
-        );
-      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Success",
-            text: `That offer was recorded.`,
-          },
-          5000,
-        );
-        localStorage.removeItem("imageUrl");
-        if (this.destinationPathAfter) {
-          (this.$router as Router).push({ path: this.destinationPathAfter });
-        } else {
-          (this.$router as Router).back();
-        }
-      }
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (error: any) {
-      console.error("Error with give recordation caught:", error);
-      const errorMessage =
-        error.userMessage ||
-        error.response?.data?.error?.message ||
-        "There was an error recording the give.";
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: errorMessage,
-        },
-        -1,
-      );
-    }
-  }
-
-  constructOfferParam() {
-    const recipientDid = this.offeredToRecipient
-      ? this.recipientDid
-      : undefined;
-    const projectId = this.offeredToProject ? this.projectId : undefined;
-    const giveClaim = hydrateOffer(
-      this.prevCredToEdit?.claim as OfferVerifiableCredential,
-      this.activeDid,
-      recipientDid,
-      this.itemDescription,
-      parseFloat(this.amountInput),
-      this.unitCode,
-      this.conditionDescription,
-      projectId,
-      this.validThroughDateInput,
-      this.prevCredToEdit?.id as string,
-    );
-    const claimStr = JSON.stringify(giveClaim);
-    return claimStr;
-  }
-
-  // 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
-  isCreationError(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
-  getCreationErrorMessage(result: any) {
-    return (
-      result.error?.userMessage ||
-      result.error?.error ||
-      result.response?.data?.error?.message
-    );
-  }
-
-  explainData() {
-    this.$notify(
-      {
-        group: "alert",
-        type: "success",
-        title: "Data Sharing",
-        text: libsUtil.PRIVACY_MESSAGE,
-      },
-      -1,
-    );
-  }
-}
-</script>

src/views/ProjectViewView.vue

@@ -5,7 +5,7 @@
   <!-- CONTENT -->
   <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
     <!-- Breadcrumb -->
-    <div id="ViewBreadcrumb">
+    <div id="ViewBreadcrumb" class="mb-8">
       <h1 class="text-lg text-center font-light relative px-7">
         <!-- Back -->
         <button
@@ -15,25 +15,23 @@
           <fa icon="chevron-left" class="fa-fw"></fa>
         </button>
         Idea
-        <h2 class="text-xl font-semibold">{{ name }}</h2>
       </h1>
     </div>
 
     <!-- Project Details -->
-    <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mt-4">
+    <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4">
       <div>
-        <div class="pb-4 flex gap-4">
-          <div class="pt-1">
+        <div class="block pb-4 flex gap-4">
+          <div class="flex-none w-16 pt-1">
             <ProjectIcon
               :entityId="projectId"
               :iconSize="64"
-              :imageUrl="imageUrl"
-              :linkToFull="true"
-              class="block border border-slate-300 rounded-md max-h-16 max-w-16"
-            />
+              class="block border border-slate-300 rounded-md"
+            ></ProjectIcon>
           </div>
 
           <div class="overflow-hidden">
+            <h2 class="text-xl font-semibold">{{ name }}</h2>
             <div class="text-sm mb-3">
               <div class="truncate">
                 <fa icon="user" class="fa-fw text-slate-400"></fa>
@@ -55,9 +53,9 @@
                   <span v-show="showDidCopy">Copied DID</span>
                 </span>
               </div>
-              <div v-if="startTime">
+              <div v-if="timeSince">
                 <fa icon="calendar" class="fa-fw text-slate-400"></fa>
-                {{ startTime }}
+                {{ timeSince }}
               </div>
               <div v-if="latitude || longitude">
                 <fa icon="location-dot" class="fa-fw text-slate-400"></fa>
@@ -71,9 +69,8 @@
               </div>
               <div v-if="url">
                 <fa icon="globe" class="fa-fw text-slate-400"></fa>
-                <a :href="addScheme(url)" target="_blank" class="underline">
-                  {{ domainForWebsite(this.url) }}
-                  <fa icon="arrow-up-right-from-square" class="fa-fw" />
+                <a :href="addScheme(url)" target="_blank" class="underline"
+                  >{{ domainForWebsite(this.url) }}
                 </a>
               </div>
             </div>
@@ -115,70 +112,27 @@
       </button>
     </div>
 
-    <div class="grid items-start grid-cols-1 sm:grid-cols-2 gap-4 mt-4">
-      <div>
-        <div
-          v-if="fulfillersToThis.length > 0"
-          class="bg-slate-100 px-4 py-3 rounded-md"
-        >
-          <h3 class="text-sm uppercase font-semibold mt-3">
-            Projects That Contribute To This
-          </h3>
-          <!-- centering because long, wrapped project names didn't left align with blank or "text-left" -->
-          <div class="text-center">
-            <div v-for="plan in fulfillersToThis" :key="plan.handleId">
-              <button
-                @click="onClickLoadProject(plan.handleId)"
-                class="text-blue-500"
-              >
-                {{ plan.name }}
-              </button>
-            </div>
-            <div v-if="fulfillersToHitLimit" class="text-center">
-              <button @click="loadPlanFulfillersTo()">Load More</button>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <div>
-        <div v-if="fulfilledByThis" class="bg-slate-100 px-4 py-3 rounded-md">
-          <h3 class="text-sm uppercase font-semibold mb-3">
-            Projects Getting Contributions From This
-          </h3>
-          <!-- centering because long, wrapped project names didn't left align with blank or "text-left" -->
-          <div class="text-center">
-            <button
-              @click="onClickLoadProject(fulfilledByThis.handleId)"
-              class="text-blue-500"
-            >
-              {{ fulfilledByThis.name }}
-            </button>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div v-if="activeDid && isRegistered" class="mt-4">
+    <div v-if="activeDid" class="mb-4">
       <div class="text-center">
         <button
-          data-testId="offerButton"
           @click="openOfferDialog()"
-          class="block w-full text-lg font-bold 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-2 py-3 rounded-md"
+          class="block w-full text-lg font-bold 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-2 py-3 rounded-md"
         >
           Offer (maybe with conditions)...
         </button>
       </div>
     </div>
-    <OfferDialog
-      ref="customOfferDialog"
-      :projectId="this.projectId"
-      :projectName="this.name"
-    />
+    <OfferDialog ref="customOfferDialog" :projectId="this.projectId" />
 
-    <div v-if="activeDid && isRegistered">
+    <div v-if="activeDid">
+      <GiftedDialog
+        ref="customGiveDialog"
+        message="Received from"
+        :projectId="this.projectId"
+      >
+      </GiftedDialog>
       <div class="text-center">
-        <p class="mt-2 mt-4 text-center">Record a contribution from:</p>
+        <p class="mt-2 mb-4 text-center">Record a contribution from:</p>
       </div>
       <ul
         class="grid grid-cols-4 sm:grid-cols-5 md:grid-cols-6 gap-x-3 gap-y-5 text-center mb-5"
@@ -199,7 +153,7 @@
           <h3
             class="text-xs italic font-medium text-ellipsis whitespace-nowrap overflow-hidden"
           >
-            Unnamed/Unknown
+            Anonymous/Unnamed
           </h3>
         </li>
         <li
@@ -208,9 +162,9 @@
           @click="openGiftDialog(contact)"
         >
           <EntityIcon
-            :contact="contact"
+            :entityId="contact.did"
             :iconSize="64"
-            class="mx-auto border border-slate-300 rounded-md mb-1 cursor-pointer"
+            class="mx-auto border border-slate-300 rounded-md mb-1"
           />
           <h3
             class="text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden"
@@ -224,18 +178,18 @@
       <a
         v-if="allContacts.length >= 7"
         @click="onClickAllContactsGifting()"
-        class="block text-center text-md font-bold bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md"
+        class="block text-center text-md font-bold uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md"
       >
         Show More Contacts&hellip;
       </a>
-
-      <GiftedDialog ref="customGiveDialog" :projectId="this.projectId" />
     </div>
 
-    <!-- Offers & Gifts to & from this -->
-    <div class="grid items-start grid-cols-1 sm:grid-cols-3 gap-4 mt-4">
+    <!-- Gifts to & from this -->
+    <div class="grid items-start grid-cols-1 sm:grid-cols-3 gap-4">
       <div class="bg-slate-100 px-4 py-3 rounded-md">
-        <h3 class="text-sm font-semibold mb-3">Offered To This Idea</h3>
+        <h3 class="text-sm uppercase font-semibold mb-3">
+          Offered To This Idea
+        </h3>
 
         <div v-if="offersToThis.length === 0">
           (None yet. Wanna
@@ -292,20 +246,16 @@
             </div>
           </li>
         </ul>
-        <div v-if="offersHitLimit" class="text-center text-blue-500">
-          <button @click="loadOffers()">Load More</button>
-        </div>
       </div>
 
       <div class="bg-slate-100 px-4 py-3 rounded-md">
-        <h3 class="text-sm font-semibold mb-3">Given To This Idea</h3>
+        <h3 class="text-sm uppercase font-semibold mb-3">Given To This Idea</h3>
 
         <div v-if="givesToThis.length === 0">
           (None yet. If you've seen something, say something by clicking a
           contact above.)
         </div>
 
-        <!-- similar to gift display below -->
         <ul v-else class="text-sm border-t border-slate-300">
           <li
             v-for="give in givesToThis"
@@ -313,8 +263,8 @@
             class="py-1.5 border-b border-slate-300"
           >
             <div class="flex justify-between gap-4">
-              <span>
-                <fa icon="user" class="fa-fw text-slate-400" />
+              <span
+                ><fa icon="user" class="fa-fw text-slate-400"></fa>
                 {{
                   serverUtil.didInfo(
                     give.agentDid,
@@ -343,86 +293,59 @@
               <a @click="onClickLoadClaim(give.jwtId)">
                 <fa icon="file-lines" class="text-blue-500 cursor-pointer" />
               </a>
-              <a
-                v-if="checkIsConfirmable(give)"
-                @click="confirmConfirmClaim(give)"
-              >
+              <a v-if="checkIsConfirmable(give)" @click="confirmClaim(give)">
                 <fa icon="circle-check" class="text-blue-500 cursor-pointer" />
               </a>
             </div>
-            <div v-if="give.fullClaim.image" class="flex justify-center">
-              <a :href="give.fullClaim.image" target="_blank">
-                <img :src="give.fullClaim.image" class="h-24 mt-2 rounded-xl" />
-              </a>
-            </div>
           </li>
         </ul>
-        <div v-if="givesHitLimit" class="text-center text-blue-500">
-          <button @click="loadGives()">Load More</button>
-        </div>
       </div>
 
       <div class="grid items-start grid-cols-1 gap-4">
         <div
-          v-if="givesProvidedByThis.length > 0"
+          v-if="fulfillersToThis.length > 0"
           class="bg-slate-100 px-4 py-3 rounded-md"
         >
-          <div>
-            <h3 class="text-sm font-semibold border-b">
-              Individuals Getting Contributions From This
-            </h3>
-            <!-- similar to gift display above -->
-            <ul class="text-sm border-t border-slate-300">
-              <li
-                v-for="give in givesProvidedByThis"
-                :key="give.id"
-                class="py-1.5 border-b border-slate-300"
+          <h3 class="text-sm uppercase font-semibold mb-3">
+            Contributions To This Idea
+          </h3>
+          <!-- centering because long, wrapped project names didn't left align with blank or "text-left" -->
+          <div class="text-center">
+            <div v-for="plan in fulfillersToThis" :key="plan.handleId">
+              <button
+                @click="onClickLoadProject(plan.handleId)"
+                class="text-blue-500"
               >
-                <div class="flex justify-between gap-4">
-                  <span>
-                    {{
-                      serverUtil.didInfo(
-                        give.agentDid,
-                        activeDid,
-                        allMyDids,
-                        allContacts,
-                      )
-                    }}
-                  </span>
-                  <span v-if="give.amount" class="whitespace-nowrap">
-                    <fa
-                      :icon="libsUtil.iconForUnitCode(give.unit)"
-                      class="fa-fw text-slate-400"
-                    />{{ give.amount }}
-                  </span>
-                </div>
-                <div class="text-slate-500">
-                  <fa icon="calendar" class="fa-fw text-slate-400" />
-                  {{ give.issuedAt?.substring(0, 10) }}
-                </div>
-                <div v-if="give.description" class="text-slate-500">
-                  <fa icon="comment" class="fa-fw text-slate-400" />
-                  {{ give.description }}
-                </div>
-                <a @click="onClickLoadClaim(give.jwtId)">
-                  <fa icon="file-lines" class="text-blue-500 cursor-pointer" />
-                </a>
-              </li>
-            </ul>
-            <div v-if="givesProvidedByHitLimit" class="text-center">
-              <button @click="loadGivesProvidedBy()">Load More</button>
+                {{ plan.name }}
+              </button>
             </div>
           </div>
         </div>
+
+        <div v-if="fulfilledByThis" class="bg-slate-100 px-4 py-3 rounded-md">
+          <h3 class="text-sm uppercase font-semibold mb-3">
+            Contributions From This Idea
+          </h3>
+          <!-- centering because long, wrapped project names didn't left align with blank or "text-left" -->
+          <div class="text-center">
+            <button
+              @click="onClickLoadProject(fulfilledByThis.handleId)"
+              class="text-blue-500"
+            >
+              {{ fulfilledByThis.name }}
+            </button>
+          </div>
+        </div>
       </div>
     </div>
   </section>
 </template>
 
 <script lang="ts">
-import { AxiosError } from "axios";
+import { AxiosError, RawAxiosRequestHeaders } from "axios";
+import * as moment from "moment";
+import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import GiftedDialog from "@/components/GiftedDialog.vue";
 import OfferDialog from "@/components/OfferDialog.vue";
@@ -435,16 +358,14 @@ import { accountsDB, db } from "@/db/index";
 import { Account } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { accessToken } from "@/libs/crypto";
 import * as libsUtil from "@/libs/util";
 import {
   BLANK_GENERIC_SERVER_RECORD,
   GenericCredWrapper,
-  getHeaders,
-  GiverReceiverInputInfo,
+  GiverInputInfo,
   GiveSummaryRecord,
-  GiveVerifiableCredential,
   OfferSummaryRecord,
-  OfferVerifiableCredential,
   PlanSummaryRecord,
 } from "@/libs/endorserServer";
 import * as serverUtil from "@/libs/endorserServer";
@@ -471,22 +392,15 @@ export default class ProjectViewView extends Vue {
   expanded = false;
   fulfilledByThis: PlanSummaryRecord | null = null;
   fulfillersToThis: Array<PlanSummaryRecord> = [];
-  fulfillersToHitLimit = false;
   givesToThis: Array<GiveSummaryRecord> = [];
-  givesHitLimit = false;
-  givesProvidedByThis: Array<GiveSummaryRecord> = [];
-  givesProvidedByHitLimit = false;
-  imageUrl = "";
-  isRegistered = false;
   issuer = "";
   latitude = 0;
   longitude = 0;
   name = "";
   offersToThis: Array<OfferSummaryRecord> = [];
-  offersHitLimit = false;
   projectId = localStorage.getItem("projectId") || ""; // handle ID
   showDidCopy = false;
-  startTime = "";
+  timeSince = "";
   truncatedDesc = "";
   truncateLength = 40;
   url = "";
@@ -500,18 +414,29 @@ export default class ProjectViewView extends Vue {
     this.activeDid = settings?.activeDid || "";
     this.apiServer = settings?.apiServer || "";
     this.allContacts = await db.contacts.toArray();
-    this.isRegistered = !!settings?.isRegistered;
 
     await accountsDB.open();
     const accounts = accountsDB.accounts;
     const accountsArr: Account[] = await accounts?.toArray();
     this.allMyDids = accountsArr.map((acc) => acc.did);
+    const account = accountsArr.find((acc) => acc.did === this.activeDid);
+    const identity = JSON.parse(account?.identity || "null");
 
     const pathParam = window.location.pathname.substring("/project/".length);
     if (pathParam) {
       this.projectId = decodeURIComponent(pathParam);
     }
-    this.loadProject(this.projectId, this.activeDid);
+    this.loadProject(this.projectId, identity);
+  }
+
+  public async getIdentity(activeDid: string) {
+    await accountsDB.open();
+    const account = (await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first()) as Account;
+    const identity = JSON.parse(account?.identity || "null");
+    return identity;
   }
 
   onEditClick() {
@@ -519,7 +444,7 @@ export default class ProjectViewView extends Vue {
     const route = {
       name: "new-edit-project",
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   // Isn't there a better way to make this available to the template?
@@ -531,26 +456,29 @@ export default class ProjectViewView extends Vue {
     this.expanded = false;
   }
 
-  async loadProject(projectId: string, userDid: string) {
+  async loadProject(projectId: string, identity: IIdentifier) {
     this.projectId = projectId;
 
     const url =
       this.apiServer + "/api/claim/byHandle/" + encodeURIComponent(projectId);
-    const headers = await getHeaders(userDid);
+    const headers: RawAxiosRequestHeaders = {
+      "Content-Type": "application/json",
+    };
+    if (identity) {
+      const token = await accessToken(identity);
+      headers["Authorization"] = "Bearer " + token;
+    }
 
     try {
       const resp = await this.axios.get(url, { headers });
       if (resp.status === 200) {
-        const startTime = resp.data.claim?.startTime;
+        const startTime = resp.data.startTime;
         if (startTime != null) {
-          const startDateTime = new Date(startTime);
-          this.startTime =
-            startDateTime.toLocaleDateString() +
-            " " +
-            startDateTime.toLocaleTimeString();
+          const eventDate = new Date(startTime);
+          const now = moment.now();
+          this.timeSince = moment.utc(now).to(eventDate);
         }
         this.agentDid = resp.data.claim?.agent?.identifier;
-        this.imageUrl = resp.data.claim?.image;
         this.issuer = resp.data.issuer;
         this.name = resp.data.claim?.name || "(no name)";
         this.description = resp.data.claim?.description || "(no description)";
@@ -568,7 +496,7 @@ export default class ProjectViewView extends Vue {
             title: "Error",
             text: "There was a problem getting that project. See logs for more info.",
           },
-          5000,
+          -1,
         );
       }
     } catch (error: unknown) {
@@ -582,7 +510,7 @@ export default class ProjectViewView extends Vue {
             title: "Error",
             text: "That project does not exist.",
           },
-          5000,
+          -1,
         );
       } else {
         this.$notify(
@@ -592,18 +520,82 @@ export default class ProjectViewView extends Vue {
             title: "Error",
             text: "Something went wrong retrieving that project. See logs for more info.",
           },
-          5000,
+          -1,
         );
       }
     }
 
-    this.loadGives();
+    const givesInUrl =
+      this.apiServer +
+      "/api/v2/report/givesToPlans?planIds=" +
+      encodeURIComponent(JSON.stringify([projectId]));
+    try {
+      const resp = await this.axios.get(givesInUrl, { headers });
+      if (resp.status === 200 && resp.data.data) {
+        this.givesToThis = resp.data.data;
+      } else {
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: "Failed to retrieve gives to this project.",
+          },
+          -1,
+        );
+      }
+    } catch (error: unknown) {
+      const serverError = error as AxiosError;
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "Something went wrong retrieving gives to this project.",
+        },
+        -1,
+      );
+      console.error(
+        "Error retrieving gives to this project:",
+        serverError.message,
+      );
+    }
 
-    this.loadGivesProvidedBy();
-
-    this.loadOffers();
-
-    this.loadPlanFulfillersTo();
+    const offersToUrl =
+      this.apiServer +
+      "/api/v2/report/offersToPlans?planIds=" +
+      encodeURIComponent(JSON.stringify([projectId]));
+    try {
+      const resp = await this.axios.get(offersToUrl, { headers });
+      if (resp.status === 200 && resp.data.data) {
+        this.offersToThis = resp.data.data;
+      } else {
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: "Failed to retrieve offers to this project.",
+          },
+          -1,
+        );
+      }
+    } catch (error: unknown) {
+      const serverError = error as AxiosError;
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "Something went wrong retrieving offers to this project.",
+        },
+        -1,
+      );
+      console.error(
+        "Error retrieving offers to this project:",
+        serverError.message,
+      );
+    }
 
     const fulfilledByUrl =
       this.apiServer +
@@ -621,7 +613,7 @@ export default class ProjectViewView extends Vue {
             title: "Error",
             text: "Failed to retrieve plans fulfilled by this project.",
           },
-          5000,
+          -1,
         );
       }
     } catch (error: unknown) {
@@ -633,137 +625,31 @@ export default class ProjectViewView extends Vue {
           title: "Error",
           text: "Something went wrong retrieving plans fulfilled by this project.",
         },
-        5000,
+        -1,
       );
       console.error(
         "Error retrieving plans fulfilled by this project:",
         serverError.message,
       );
     }
-  }
 
-  async loadGives() {
-    const givesUrl =
-      this.apiServer +
-      "/api/v2/report/givesToPlans?planIds=" +
-      encodeURIComponent(JSON.stringify([this.projectId]));
-    let postfix = "";
-    if (this.givesToThis.length > 0) {
-      postfix =
-        "&beforeId=" + this.givesToThis[this.givesToThis.length - 1].jwtId;
-    }
-    const givesInUrl = givesUrl + postfix;
-
-    const headers = await getHeaders(this.activeDid);
-    try {
-      const resp = await this.axios.get(givesInUrl, { headers });
-      if (resp.status === 200 && resp.data.data) {
-        this.givesToThis = this.givesToThis.concat(resp.data.data);
-        this.givesHitLimit = resp.data.hitLimit;
-      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "Failed to retrieve more gives to this project.",
-          },
-          5000,
-        );
-      }
-    } catch (error: unknown) {
-      const serverError = error as AxiosError;
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "Something went wrong retrieving more gives to this project.",
-        },
-        5000,
-      );
-      console.error(
-        "Something went wrong retrieving more gives to this project:",
-        serverError.message,
-      );
-    }
-  }
-
-  async loadOffers() {
-    const offersUrl =
-      this.apiServer +
-      "/api/v2/report/offersToPlans?planIds=" +
-      encodeURIComponent(JSON.stringify([this.projectId]));
-    let postfix = "";
-    if (this.offersToThis.length > 0) {
-      postfix =
-        "&beforeId=" + this.offersToThis[this.offersToThis.length - 1].jwtId;
-    }
-    const offersInUrl = offersUrl + postfix;
-
-    const headers = await getHeaders(this.activeDid);
-    try {
-      const resp = await this.axios.get(offersInUrl, { headers });
-      if (resp.status === 200 && resp.data.data) {
-        this.offersToThis = this.offersToThis.concat(resp.data.data);
-        this.offersHitLimit = resp.data.hitLimit;
-      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "Failed to retrieve more offers to this project.",
-          },
-          5000,
-        );
-      }
-    } catch (error: unknown) {
-      const serverError = error as AxiosError;
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "Something went wrong retrieving more offers to this project.",
-        },
-        5000,
-      );
-      console.error(
-        "Something went wrong retrieving more offers to this project:",
-        serverError.message,
-      );
-    }
-  }
-
-  async loadPlanFulfillersTo() {
-    const fulfillsUrl =
+    const fulfillersToUrl =
       this.apiServer +
       "/api/v2/report/planFulfillersToPlan?planHandleId=" +
-      encodeURIComponent(this.projectId);
-    let postfix = "";
-    if (this.fulfillersToThis.length > 0) {
-      postfix =
-        "&beforeId=" +
-        this.fulfillersToThis[this.fulfillersToThis.length - 1].jwtId;
-    }
-    const fulfillsInUrl = fulfillsUrl + postfix;
-
-    const headers = await getHeaders(this.activeDid);
+      encodeURIComponent(projectId);
     try {
-      const resp = await this.axios.get(fulfillsInUrl, { headers });
+      const resp = await this.axios.get(fulfillersToUrl, { headers });
       if (resp.status === 200) {
-        this.fulfillersToThis = this.fulfillersToThis.concat(resp.data.data);
-        this.fulfillersToHitLimit = resp.data.hitLimit;
+        this.fulfillersToThis = resp.data.data;
       } else {
         this.$notify(
           {
             group: "alert",
             type: "danger",
             title: "Error",
-            text: "Failed to retrieve more plans that fullfill this project.",
+            text: "Failed to retrieve plan fulfillers to this project.",
           },
-          5000,
+          -1,
         );
       }
     } catch (error: unknown) {
@@ -773,62 +659,12 @@ export default class ProjectViewView extends Vue {
           group: "alert",
           type: "danger",
           title: "Error",
-          text: "Something went wrong retrieving more plans that fulfull this project.",
+          text: "Something went wrong retrieving plan fulfillers to this project.",
         },
-        5000,
+        -1,
       );
       console.error(
-        "Something went wrong retrieving more plans that fulfill this project:",
-        serverError.message,
-      );
-    }
-  }
-
-  async loadGivesProvidedBy() {
-    const providedByUrl =
-      this.apiServer +
-      "/api/v2/report/givesProvidedBy?providerId=" +
-      encodeURIComponent(this.projectId);
-    let postfix = "";
-    if (this.givesProvidedByThis.length > 0) {
-      postfix =
-        "&beforeId=" +
-        this.givesProvidedByThis[this.givesProvidedByThis.length - 1].jwtId;
-    }
-    const providedByFullUrl = providedByUrl + postfix;
-
-    const headers = await getHeaders(this.activeDid);
-    try {
-      const resp = await this.axios.get(providedByFullUrl, { headers });
-      if (resp.status === 200) {
-        this.givesProvidedByThis = this.givesProvidedByThis.concat(
-          resp.data.data,
-        );
-        this.givesProvidedByHitLimit = resp.data.hitLimit;
-      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "Failed to retrieve gives that were provided by this project.",
-          },
-          5000,
-        );
-      }
-    } catch (error: unknown) {
-      const serverError = error as AxiosError;
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "Something went wrong retrieving gives that were provided by this project.",
-        },
-        5000,
-      );
-      console.error(
-        "Something went wrong retrieving gives that were provided by this project:",
+        "Error retrieving plan fulfillers to this project:",
         serverError.message,
       );
     }
@@ -843,8 +679,8 @@ export default class ProjectViewView extends Vue {
     const route = {
       path: "/project/" + encodeURIComponent(projectId),
     };
-    (this.$router as Router).push(route);
-    this.loadProject(projectId, this.activeDid);
+    this.$router.push(route);
+    this.loadProject(projectId, await this.getIdentity(this.activeDid));
   }
 
   getOpenStreetMapUrl() {
@@ -861,13 +697,8 @@ export default class ProjectViewView extends Vue {
     );
   }
 
-  openGiftDialog(contact?: GiverReceiverInputInfo) {
-    (this.$refs.customGiveDialog as GiftedDialog).open(
-      contact,
-      undefined,
-      undefined,
-      "Given by " + (contact?.name || "someone not named"),
-    );
+  openGiftDialog(contact?: GiverInputInfo) {
+    (this.$refs.customGiveDialog as GiftedDialog).open(contact);
   }
 
   openOfferDialog() {
@@ -877,20 +708,20 @@ export default class ProjectViewView extends Vue {
   onClickAllContactsGifting() {
     localStorage.setItem("projectId", this.projectId);
     const route = {
-      name: "contact-gift",
+      name: "contact-gives",
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   onClickLoadClaim(jwtId: string) {
     const route = {
       path: "/claim/" + encodeURIComponent(jwtId),
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   checkIsFulfillable(offer: OfferSummaryRecord) {
-    const offerRecord: GenericCredWrapper<OfferVerifiableCredential> = {
+    const offerRecord: GenericCredWrapper = {
       ...BLANK_GENERIC_SERVER_RECORD,
       claim: offer.fullClaim,
       claimType: "Offer",
@@ -900,20 +731,15 @@ export default class ProjectViewView extends Vue {
   }
 
   onClickFulfillGiveToOffer(offer: OfferSummaryRecord) {
-    const offerRecord: GenericCredWrapper<OfferVerifiableCredential> = {
+    const offerRecord: GenericCredWrapper = {
       ...BLANK_GENERIC_SERVER_RECORD,
       claim: offer.fullClaim,
       issuer: offer.offeredByDid,
     };
-    const giver: GiverReceiverInputInfo = {
+    const giver: GiverInputInfo = {
       did: libsUtil.offerGiverDid(offerRecord),
     };
-    (this.$refs.customGiveDialog as GiftedDialog).open(
-      giver,
-      undefined,
-      offer.handleId,
-      "Given by " + (giver?.name || "someone not named"),
-    );
+    (this.$refs.customGiveDialog as GiftedDialog).open(giver, offer.handleId);
   }
 
   // return an HTTPS URL if it's not a global URL
@@ -945,81 +771,64 @@ export default class ProjectViewView extends Vue {
   }
 
   checkIsConfirmable(give: GiveSummaryRecord) {
-    const giveDetails: GenericCredWrapper<GiveVerifiableCredential> = {
+    const giveDetails: GenericCredWrapper = {
       ...BLANK_GENERIC_SERVER_RECORD,
       claim: give.fullClaim,
       claimType: "GiveAction",
       issuer: give.agentDid,
     };
-    return libsUtil.isGiveRecordTheUserCanConfirm(
-      this.isRegistered,
-      giveDetails,
-      this.activeDid,
-    );
-  }
-
-  confirmConfirmClaim(give: GiveSummaryRecord) {
-    this.$notify(
-      {
-        group: "modal",
-        type: "confirm",
-        title: "Confirm",
-        text: "Do you personally confirm that this is true?",
-        onYes: async () => {
-          await this.confirmClaim(give);
-        },
-      },
-      -1,
-    );
+    return libsUtil.isGiveRecordTheUserCanConfirm(giveDetails, this.activeDid);
   }
 
   // similar code is found in ClaimView
   async confirmClaim(give: GiveSummaryRecord) {
-    // similar logic is found in endorser-mobile
-    const goodClaim = serverUtil.removeSchemaContext(
-      serverUtil.removeVisibleToDids(
-        serverUtil.addLastClaimOrHandleAsIdIfMissing(
-          give.fullClaim,
-          give.jwtId,
-          give.handleId,
+    if (confirm("Do you personally confirm that this is true?")) {
+      // similar logic is found in endorser-mobile
+      const goodClaim = serverUtil.removeSchemaContext(
+        serverUtil.removeVisibleToDids(
+          serverUtil.addLastClaimOrHandleAsIdIfMissing(
+            give.fullClaim,
+            give.jwtId,
+            give.handleId,
+          ),
         ),
-      ),
-    );
-    const confirmationClaim: serverUtil.GenericVerifiableCredential = {
-      "@context": "https://schema.org",
-      "@type": "AgreeAction",
-      object: goodClaim,
-    };
-    const result = await serverUtil.createAndSubmitClaim(
-      confirmationClaim,
-      this.activeDid,
-      this.apiServer,
-      this.axios,
-    );
-    if (result.type === "success") {
-      this.$notify(
-        {
-          group: "alert",
-          type: "success",
-          title: "Success",
-          text: "Confirmation submitted.",
-        },
-        5000,
       );
-    } else {
-      console.error("Got error submitting the confirmation:", result);
-      const message =
-        (result.error?.error as string) ||
-        "There was a problem submitting the confirmation. See logs for more info.";
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: message,
-        },
-        5000,
+      const confirmationClaim: serverUtil.GenericVerifiableCredential = {
+        "@context": "https://schema.org",
+        "@type": "AgreeAction",
+        object: goodClaim,
+      };
+      const result = await serverUtil.createAndSubmitClaim(
+        confirmationClaim,
+        await this.getIdentity(this.activeDid),
+        this.apiServer,
+        this.axios,
       );
+      if (result.type === "success") {
+        this.$notify(
+          {
+            group: "alert",
+            type: "success",
+            title: "Success",
+            text: "Confirmation submitted.",
+          },
+          5000,
+        );
+      } else {
+        console.error("Got error submitting the confirmation:", result);
+        const message =
+          (result.error?.error as string) ||
+          "There was a problem submitting the confirmation. See logs for more info.";
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: message,
+          },
+          -1,
+        );
+      }
     }
   }
 }

src/views/ProjectsView.vue

@@ -62,8 +62,8 @@
 
     <!-- New Project -->
     <button
-      v-if="isRegistered && showProjects"
-      class="fixed right-6 top-24 text-center text-4xl leading-none bg-blue-600 text-white w-14 py-2.5 rounded-full"
+      v-if="showProjects"
+      class="fixed right-6 bottom-24 text-center text-4xl leading-none bg-blue-600 text-white w-14 py-2.5 rounded-full"
       @click="onClickNewProject()"
     >
       <fa icon="plus" class="fa-fw"></fa>
@@ -79,49 +79,29 @@
 
     <!-- Offer Results List -->
     <InfiniteScroll v-if="showOffers" @reached-bottom="loadMoreOfferData">
-      <div v-if="offers.length === 0" class="text-center py-4">
-        You have not offered anything.
-        <br />
-        <router-link to="/discover" class="text-blue-600">
-          Look for projects worth some of your time.
-        </router-link>
-      </div>
-      <ul id="listOffers" class="border-t border-slate-300">
+      <ul class="border-t border-slate-300">
         <li
           class="border-b border-slate-300"
           v-for="offer in offers"
           :key="offer.handleId"
         >
           <div class="block py-4 flex gap-4">
-            <div v-if="offer.fulfillsPlanHandleId" class="flex-none">
+            <div v-if="offer.fulfillsPlanHandleId" class="flex-none w-12">
               <ProjectIcon
                 :entityId="offer.fulfillsPlanHandleId"
                 :iconSize="48"
-                class="inline-block align-middle border border-slate-300 rounded-md max-h-12 max-w-12"
-              />
+                class="inline-block align-middle border border-slate-300 rounded-md"
+              ></ProjectIcon>
             </div>
             <div v-if="offer.recipientDid" class="flex-none w-12">
               <EntityIcon
                 :entityId="offer.recipientDid"
                 :iconSize="48"
                 class="inline-block align-middle border border-slate-300 rounded-md"
-              />
+              ></EntityIcon>
             </div>
 
             <div>
-              <div>
-                To
-                {{
-                  offer.fulfillsPlanHandleId
-                    ? projectNameFromHandleId[offer.fulfillsPlanHandleId]
-                    : didInfo(
-                        offer.recipientDid,
-                        activeDid,
-                        allMyDids,
-                        allContacts,
-                      )
-                }}
-              </div>
               <div>
                 {{ offer.objectDescription }}
               </div>
@@ -197,21 +177,9 @@
         </li>
       </ul>
     </InfiniteScroll>
-
     <!-- Project Results List -->
     <InfiniteScroll v-if="showProjects" @reached-bottom="loadMoreProjectData">
-      <div v-if="projects.length === 0" class="text-center py-4">
-        You have not announced any projects.
-        <div v-if="isRegistered">
-          Hit the big
-          <fa
-            icon="plus"
-            class="bg-blue-600 text-white px-1 py-1 rounded-full"
-          />
-          button. You'll never know until you try.
-        </div>
-      </div>
-      <ul id="listProjects" class="border-t border-slate-300">
+      <ul class="border-t border-slate-300">
         <li
           class="border-b border-slate-300"
           v-for="project in projects"
@@ -221,13 +189,12 @@
             @click="onClickLoadProject(project.handleId)"
             class="block py-4 flex gap-4"
           >
-            <div class="flex-none">
+            <div class="flex-none w-12">
               <ProjectIcon
                 :entityId="project.handleId"
                 :iconSize="48"
-                :imageUrl="project.image"
-                class="inline-block align-middle border border-slate-300 rounded-md max-h-12 max-w-12"
-              />
+                class="inline-block align-middle border border-slate-300 rounded-md"
+              ></ProjectIcon>
             </div>
 
             <div class="grow overflow-hidden">
@@ -244,78 +211,76 @@
 </template>
 
 <script lang="ts">
-import { AxiosRequestConfig } from "axios";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import { accessToken } from "@/libs/crypto";
 import * as libsUtil from "@/libs/util";
+import { IIdentifier } from "@veramo/core";
 import InfiniteScroll from "@/components/InfiniteScroll.vue";
 import QuickNav from "@/components/QuickNav.vue";
 import ProjectIcon from "@/components/ProjectIcon.vue";
 import TopMessage from "@/components/TopMessage.vue";
-import {
-  didInfo,
-  getHeaders,
-  getPlanFromCache,
-  OfferSummaryRecord,
-  PlanData,
-} from "@/libs/endorserServer";
+import { OfferSummaryRecord, PlanData } from "@/libs/endorserServer";
 import EntityIcon from "@/components/EntityIcon.vue";
-import { Contact } from "@/db/tables/contacts";
 
 @Component({
   components: { EntityIcon, InfiniteScroll, QuickNav, ProjectIcon, TopMessage },
 })
 export default class ProjectsView extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
-  errNote(message) {
-    this.$notify(
-      { group: "alert", type: "danger", title: "Error", text: message },
-      5000,
-    );
-  }
 
-  activeDid = "";
-  allContacts: Array<Contact> = [];
-  allMyDids: Array<string> = [];
   apiServer = "";
   projects: PlanData[] = [];
+  currentIid: IIdentifier;
   isLoading = false;
-  isRegistered = false;
+  numAccounts = 0;
   offers: OfferSummaryRecord[] = [];
-  projectNameFromHandleId: Record<string, string> = {}; // mapping from handleId to description
   showOffers = true;
   showProjects = false;
 
   libsUtil = libsUtil;
-  didInfo = didInfo;
 
-  async mounted() {
+  /**
+   * 'created' hook runs when the Vue instance is first created
+   **/
+  async created() {
     try {
       await db.open();
       const settings = await db.settings.get(MASTER_SETTINGS_KEY);
-      this.activeDid = (settings?.activeDid as string) || "";
+      const activeDid: string = (settings?.activeDid as string) || "";
       this.apiServer = (settings?.apiServer as string) || "";
-      this.isRegistered = !!settings?.isRegistered;
-
-      this.allContacts = await db.contacts.toArray();
 
       await accountsDB.open();
-      const allAccounts = await accountsDB.accounts.toArray();
-      this.allMyDids = allAccounts.map((acc) => acc.did);
-
-      if (allAccounts.length === 0) {
+      this.numAccounts = await accountsDB.accounts.count();
+      if (this.numAccounts === 0) {
         console.error("No accounts found.");
-        this.errNote("You need an identifier to load your projects.");
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: "You need an identifier to load your projects.",
+          },
+          -1,
+        );
       } else {
+        this.currentIid = await this.getIdentity(activeDid);
         await this.loadOffers();
       }
     } catch (err) {
       console.error("Error initializing:", err);
-      this.errNote("Something went wrong loading your projects.");
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "Something went wrong loading your projects.",
+        },
+        -1,
+      );
     }
   }
 
@@ -324,23 +289,20 @@ export default class ProjectsView extends Vue {
    * @param url the url used to fetch the data
    * @param token Authorization token
    **/
-  async projectDataLoader(url: string) {
+  async projectDataLoader(url: string, token: string) {
+    const headers: { [key: string]: string } = {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${token}`,
+    };
+
     try {
-      const headers = await getHeaders(this.activeDid);
       this.isLoading = true;
-      const resp = await this.axios.get(url, { headers } as AxiosRequestConfig);
-      if (resp.status === 200 && resp.data.data) {
+      const resp = await this.axios.get(url, { headers });
+      if (resp.status === 200 || !resp.data.data) {
         const plans: PlanData[] = resp.data.data;
         for (const plan of plans) {
-          const { name, description, handleId, image, issuerDid, rowid } = plan;
-          this.projects.push({
-            name,
-            description,
-            image,
-            handleId,
-            issuerDid,
-            rowid,
-          });
+          const { name, description, handleId, issuerDid, rowid } = plan;
+          this.projects.push({ name, description, handleId, issuerDid, rowid });
         }
       } else {
         console.error(
@@ -348,12 +310,28 @@ export default class ProjectsView extends Vue {
           resp.status,
           resp.data,
         );
-        this.errNote("Failed to get projects from the server.");
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: "Failed to get projects from the server. Try again later.",
+          },
+          -1,
+        );
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (error: any) {
       console.error("Got error loading plans:", error.message || error);
-      this.errNote("Got an error loading projects.");
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "Got an error loading projects.",
+        },
+        -1,
+      );
     } finally {
       this.isLoading = false;
     }
@@ -366,18 +344,39 @@ export default class ProjectsView extends Vue {
   async loadMoreProjectData(payload: boolean) {
     if (this.projects.length > 0 && payload) {
       const latestProject = this.projects[this.projects.length - 1];
-      await this.loadProjects(`beforeId=${latestProject.rowid}`);
+      await this.loadProjects(
+        this.currentIid,
+        `beforeId=${latestProject.rowid}`,
+      );
     }
   }
 
   /**
    * Load projects initially
-   * @param issuerDid of the user
+   * @param identifier of the user
    * @param urlExtra additional url parameters in a string
    **/
-  async loadProjects(urlExtra: string = "") {
+  async loadProjects(identifier?: IIdentifier, urlExtra: string = "") {
+    const identity = identifier || this.currentIid;
     const url = `${this.apiServer}/api/v2/report/plansByIssuer?${urlExtra}`;
-    await this.projectDataLoader(url);
+    const token: string = await accessToken(identity);
+    await this.projectDataLoader(url, token);
+  }
+
+  public async getIdentity(activeDid: string): Promise<IIdentifier> {
+    await accountsDB.open();
+    const account = await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first();
+    const identity = JSON.parse((account?.identity as string) || "null");
+
+    if (!identity) {
+      throw new Error(
+        "Attempted to load project records with no identifier available.",
+      );
+    }
+    return identity;
   }
 
   /**
@@ -389,7 +388,7 @@ export default class ProjectsView extends Vue {
     const route = {
       path: "/project/" + encodeURIComponent(id),
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   /**
@@ -400,14 +399,14 @@ export default class ProjectsView extends Vue {
     const route = {
       name: "new-edit-project",
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   onClickLoadClaim(jwtId: string) {
     const route = {
       path: "/claim/" + encodeURIComponent(jwtId),
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   /**
@@ -415,38 +414,17 @@ export default class ProjectsView extends Vue {
    * @param url the url used to fetch the data
    * @param token Authorization token
    **/
-  async offerDataLoader(url: string) {
-    const headers = await getHeaders(this.activeDid);
+  async offerDataLoader(url: string, token: string) {
+    const headers: { [key: string]: string } = {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${token}`,
+    };
 
     try {
       this.isLoading = true;
-      const resp = await this.axios.get(url, { headers } as AxiosRequestConfig);
-      if (resp.status === 200 && resp.data.data) {
-        // add one-by-one as they retrieve project names, potentially from the server
-        for (const offer of resp.data.data) {
-          if (offer.fulfillsPlanHandleId) {
-            const project = await getPlanFromCache(
-              offer.fulfillsPlanHandleId,
-              this.axios,
-              this.apiServer,
-              this.activeDid,
-            );
-            const projectName = project?.name as string;
-            console.log(
-              "now have name for",
-              offer.fulfillsPlanHandleId,
-              projectName,
-            );
-            this.projectNameFromHandleId[offer.fulfillsPlanHandleId] =
-              projectName;
-            console.log(
-              "now have a real name for",
-              offer.fulfillsPlanHandleId,
-              this.projectNameFromHandleId[offer.fulfillsPlanHandleId],
-            );
-          }
-          this.offers = this.offers.concat([offer]);
-        }
+      const resp = await this.axios.get(url, { headers });
+      if (resp.status === 200 || !resp.data.data) {
+        this.offers = this.offers.concat(resp.data.data);
       } else {
         console.error(
           "Bad server response & data for offers:",
@@ -487,18 +465,20 @@ export default class ProjectsView extends Vue {
   async loadMoreOfferData(payload: boolean) {
     if (this.offers.length > 0 && payload) {
       const latestOffer = this.offers[this.offers.length - 1];
-      await this.loadOffers(`&beforeId=${latestOffer.jwtId}`);
+      await this.loadOffers(this.currentIid, `&beforeId=${latestOffer.jwtId}`);
     }
   }
 
   /**
    * Load offers initially
-   * @param issuerDid of the user
+   * @param identifier of the user
    * @param urlExtra additional url parameters in a string
    **/
-  async loadOffers(urlExtra: string = "") {
-    const url = `${this.apiServer}/api/v2/report/offers?offeredByDid=${this.activeDid}${urlExtra}`;
-    await this.offerDataLoader(url);
+  async loadOffers(identifier?: IIdentifier, urlExtra: string = "") {
+    const identity = identifier || this.currentIid;
+    const url = `${this.apiServer}/api/v2/report/offers?offeredByDid=${identity.did}${urlExtra}`;
+    const token: string = await accessToken(identity);
+    await this.offerDataLoader(url, token);
   }
 
   public computedOfferTabClassNames() {

src/views/QuickActionBvcBeginView.vue

@@ -97,7 +97,6 @@ export default class QuickActionBvcBeginView extends Vue {
   todayOrPreviousStartDate = "";
 
   async mounted() {
-    // use the time zone for Bountiful
     let currentOrPreviousSat = DateTime.now().setZone("America/Denver");
     if (currentOrPreviousSat.weekday < 6) {
       // it's not Saturday or Sunday,
@@ -124,8 +123,7 @@ export default class QuickActionBvcBeginView extends Vue {
 
     try {
       const hoursNum = libsUtil.numberOrZero(this.hoursStr);
-
-      this.$notify({ group: "alert", type: "toast", title: "Sent..." }, 1000);
+      const identity = await libsUtil.getIdentity(activeDid);
 
       // first send the claim for time given
       let timeSuccess = false;
@@ -133,7 +131,7 @@ export default class QuickActionBvcBeginView extends Vue {
         const timeResult = await createAndSubmitGive(
           axios,
           apiServer,
-          activeDid,
+          identity,
           activeDid,
           undefined,
           undefined,
@@ -154,7 +152,7 @@ export default class QuickActionBvcBeginView extends Vue {
                 timeResult?.error?.userMessage ||
                 "There was an error sending the time.",
             },
-            5000,
+            -1,
           );
         }
       }
@@ -164,7 +162,7 @@ export default class QuickActionBvcBeginView extends Vue {
       if (this.attended) {
         const attendResult = await createAndSubmitClaim(
           bvcMeetingJoinClaim(activeDid, this.todayOrPreviousStartDate),
-          activeDid,
+          identity,
           apiServer,
           axios,
         );
@@ -181,7 +179,7 @@ export default class QuickActionBvcBeginView extends Vue {
                 attendResult?.error?.userMessage ||
                 "There was an error sending the attendance.",
             },
-            5000,
+            -1,
           );
         }
       }
@@ -200,7 +198,7 @@ export default class QuickActionBvcBeginView extends Vue {
             title: "Success",
             text: actions,
           },
-          3000,
+          -1,
         );
       }
 
@@ -212,9 +210,9 @@ export default class QuickActionBvcBeginView extends Vue {
           group: "alert",
           type: "danger",
           title: "Error",
-          text: error.userMessage || "There was an error sending the claims.",
+          text: error.userMessage || "There was an error sending claims.",
         },
-        5000,
+        -1,
       );
     }
   }

src/views/QuickActionBvcEndView.vue

@@ -82,16 +82,6 @@
         page.
       </span>
     </div>
-    <div v-if="claimCountByUser > 0" class="border-b border-slate-300 pb-2">
-      <span>
-        {{
-          claimCountByUser === 1
-            ? "There is 1 other claim by you"
-            : `There are ${claimCountByUser} other claims by you`
-        }}
-        which you don't need to confirm.
-      </span>
-    </div>
 
     <div>
       <h2 class="text-2xl m-2">Anything else?</h2>
@@ -138,26 +128,28 @@
 import axios from "axios";
 import { DateTime } from "luxon";
 import * as R from "ramda";
+import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import QuickNav from "@/components/QuickNav.vue";
 import TopMessage from "@/components/TopMessage.vue";
 import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
+import { Account } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { accessToken } from "@/libs/crypto";
 import {
   BVC_MEETUPS_PROJECT_CLAIM_ID,
   claimSpecialDescription,
   containsHiddenDid,
   createAndSubmitConfirmation,
   createAndSubmitGive,
+  ErrorResult,
   GenericCredWrapper,
   GenericVerifiableCredential,
-  getHeaders,
-  ErrorResult,
 } from "@/libs/endorserServer";
+import * as libsUtil from "@/libs/util";
 
 @Component({
   methods: { claimSpecialDescription },
@@ -173,9 +165,8 @@ export default class QuickActionBvcBeginView extends Vue {
   allContacts: Array<Contact> = [];
   allMyDids: Array<string> = [];
   apiServer = "";
-  claimCountByUser = 0;
   claimCountWithHidden = 0;
-  claimsToConfirm: GenericCredWrapper<GenericVerifiableCredential>[] = [];
+  claimsToConfirm: GenericCredWrapper[] = [];
   claimsToConfirmSelected: string[] = [];
   description = "breakfast";
   loadingConfirms = true;
@@ -211,7 +202,16 @@ export default class QuickActionBvcBeginView extends Vue {
     await accountsDB.open();
     const allAccounts = await accountsDB.accounts.toArray();
     this.allMyDids = allAccounts.map((acc) => acc.did);
-    const headers = await getHeaders(this.activeDid);
+    const account: Account | undefined = await accountsDB.accounts
+      .where("did")
+      .equals(this.activeDid)
+      .first();
+    const identity: IIdentifier = JSON.parse(
+      (account?.identity as string) || "null",
+    );
+    const headers = {
+      Authorization: "Bearer " + (await accessToken(identity)),
+    };
     try {
       const response = await fetch(
         this.apiServer +
@@ -223,13 +223,12 @@ export default class QuickActionBvcBeginView extends Vue {
       );
 
       if (!response.ok) {
-        console.error("Bad response", response);
+        console.log("Bad response", response);
         throw new Error("Bad response when retrieving claims.");
       }
       await response.json().then((data) => {
         const dataByOthers = R.reject(
-          (claim: GenericCredWrapper<GenericVerifiableCredential>) =>
-            claim.issuer === this.activeDid,
+          (claim: GenericCredWrapper) => claim.issuer === this.activeDid,
           data,
         );
         const dataByOthersWithoutHidden = R.reject(
@@ -237,7 +236,6 @@ export default class QuickActionBvcBeginView extends Vue {
           dataByOthers,
         );
         this.claimsToConfirm = dataByOthersWithoutHidden;
-        this.claimCountByUser = data.length - dataByOthers.length;
         this.claimCountWithHidden =
           dataByOthers.length - dataByOthersWithoutHidden.length;
       });
@@ -250,7 +248,7 @@ export default class QuickActionBvcBeginView extends Vue {
           title: "Error",
           text: "There was an error retrieving today's claims to confirm.",
         },
-        5000,
+        -1,
       );
     }
     this.loadingConfirms = false;
@@ -260,12 +258,12 @@ export default class QuickActionBvcBeginView extends Vue {
     const route = {
       path: "/claim/" + encodeURIComponent(jwtId),
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   async record() {
     try {
-      this.$notify({ group: "alert", type: "toast", title: "Sent..." }, 1000);
+      const identity = await libsUtil.getIdentity(this.activeDid);
 
       // in parallel, make a confirmation for each selected claim and send them all to the server
       const confirmResults = await Promise.allSettled(
@@ -276,8 +274,9 @@ export default class QuickActionBvcBeginView extends Vue {
           if (!record) {
             return { type: "error", error: "Record not found." };
           }
+          const identity = await libsUtil.getIdentity(this.activeDid);
           return createAndSubmitConfirmation(
-            this.activeDid,
+            identity,
             record.claim as GenericVerifiableCredential,
             record.id,
             record.handleId,
@@ -301,7 +300,7 @@ export default class QuickActionBvcBeginView extends Vue {
             title: "Error",
             text: `There was an error sending ${howMany} of the confirmations.`,
           },
-          5000,
+          -1,
         );
       }
 
@@ -311,7 +310,7 @@ export default class QuickActionBvcBeginView extends Vue {
         const giveResult = await createAndSubmitGive(
           axios,
           this.apiServer,
-          this.activeDid,
+          identity,
           undefined,
           this.activeDid,
           this.description,
@@ -331,7 +330,7 @@ export default class QuickActionBvcBeginView extends Vue {
                 (giveResult as ErrorResult)?.error?.userMessage ||
                 "There was an error sending that give.",
             },
-            5000,
+            -1,
           );
         }
       }
@@ -356,7 +355,7 @@ export default class QuickActionBvcBeginView extends Vue {
             title: "Success",
             text: actions,
           },
-          3000,
+          -1,
         );
       }
 
@@ -370,7 +369,7 @@ export default class QuickActionBvcBeginView extends Vue {
           title: "Error",
           text: error.userMessage || "There was an error sending claims.",
         },
-        5000,
+        -1,
       );
     }
   }

src/views/SearchAreaView.vue

@@ -22,8 +22,8 @@
     </div>
 
     <div class="px-2 py-4">
-      This location is only stored on your device. It is sometimes sent from
-      your device to run searches but it is not stored on our servers.
+      This location is only stored on your device. It is used to show you more
+      appropriate projects but is not stored on any servers.
     </div>
 
     <div>
@@ -105,7 +105,6 @@ import {
   LRectangle,
   LTileLayer,
 } from "@vue-leaflet/vue-leaflet";
-import { Router } from "vue-router";
 
 import QuickNav from "@/components/QuickNav.vue";
 import { NotificationIface } from "@/constants/app";
@@ -199,7 +198,7 @@ export default class DiscoverView extends Vue {
           },
         };
         await db.open();
-        await db.settings.update(MASTER_SETTINGS_KEY, {
+        db.settings.update(MASTER_SETTINGS_KEY, {
           searchBoxes: [newSearchBox],
         });
         this.searchBox = newSearchBox;
@@ -214,7 +213,7 @@ export default class DiscoverView extends Vue {
           },
           7000,
         );
-        (this.$router as Router).back();
+        this.$router.back();
       } catch (err) {
         this.$notify(
           {
@@ -246,7 +245,7 @@ export default class DiscoverView extends Vue {
   public async forgetSearchBox() {
     try {
       await db.open();
-      await db.settings.update(MASTER_SETTINGS_KEY, {
+      db.settings.update(MASTER_SETTINGS_KEY, {
         searchBoxes: [],
         filterFeedByNearby: false,
       });

src/views/SeedBackupView.vue

@@ -33,65 +33,30 @@
       <p class="text-center mb-4">
         <b class="text-red-600">BEWARE!</b> Anyone who has this seed phrase will
         be able impersonate you and take over any digital holdings based on it.
-        Reveal it when you are somewhere private, when only you can see your
-        screen, and record it somewhere only you have access. A password manager
-        is a good idea, and so is a piece of paper in a vault.
-        <i
-          >We recommend you do NOT take a screenshot or send it to any online
-          service.</i
-        >
+        Reveal it when you are somewhere only you can see your screen, and
+        record it somewhere only you have access.
+        <i>Don't take a screenshot or send it to any online service.</i>
       </p>
 
       <p v-if="numAccounts > 1">
         <b class="text-orange-600">Note:</b> You have more than one identifier
         stored in this browser. If they are all based on the same seed as the
-        current identifier, this one backup is sufficient, as long as you also
-        record the derivation path. However, if you have different seeds for
-        other identifiers, you will have to back them up separately.
+        current identifier, this one backup is sufficient; however, if you have
+        different seeds for other identifiers, you will have to back them up
+        separately.
       </p>
 
       <div class="bg-slate-100 rounded-md overflow-hidden p-4 mb-4">
-        <p v-if="showSeed" class="text-center text-slate-700 mt-2">
-          {{ activeAccount.mnemonic }}
-          <button
-            v-show="!showCopiedSeed"
-            @click="
-              doCopyTwoSecRedo(
-                activeAccount.mnemonic as string,
-                () => (showCopiedSeed = !showCopiedSeed),
-              )
-            "
-          >
-            <fa icon="copy" class="text-slate-400 fa-fw"></fa>
-          </button>
-          <span v-show="showCopiedSeed" class="text-sm text-green-500">
-            Copied
-          </span>
-          <br />
-          <br />
-          Derivation Path: {{ activeAccount.derivationPath }}
-          <button
-            v-show="!showCopiedDeri"
-            @click="
-              doCopyTwoSecRedo(
-                activeAccount.derivationPath as string,
-                () => (showCopiedDeri = !showCopiedDeri),
-              )
-            "
-          >
-            <fa icon="copy" class="text-slate-400 fa-fw"></fa>
-          </button>
-          <span v-show="showCopiedDeri" class="text-sm text-green-500"
-            >Copied</span
-          >
-        </p>
         <button
-          v-else
           class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
-          @click="showSeed = true"
+          @click="showSeedPhrase"
         >
           Reveal my Seed Phrase
         </button>
+
+        <p v-if="showSeed" class="text-center text-slate-700 mt-2">
+          {{ activeAccount.mnemonic }}
+        </p>
       </div>
     </div>
     <div v-else>You do not have an active identifier.</div>
@@ -99,24 +64,24 @@
 </template>
 
 <script lang="ts">
-import * as R from "ramda";
 import { Component, Vue } from "vue-facing-decorator";
-import { useClipboard } from "@vueuse/core";
+import * as R from "ramda";
 
 import QuickNav from "@/components/QuickNav.vue";
 import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
-import { Account } from "@/db/tables/accounts";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 
+interface Account {
+  mnemonic: string;
+}
+
 @Component({ components: { QuickNav } })
 export default class SeedBackupView extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   activeAccount: Account | null | undefined = null;
   numAccounts = 0;
-  showCopiedDeri = false;
-  showCopiedSeed = false;
   showSeed = false;
 
   // 'created' hook runs when the Vue instance is first created
@@ -144,12 +109,8 @@ export default class SeedBackupView extends Vue {
     }
   }
 
-  // call fn, copy text to the clipboard, then redo fn after 2 seconds
-  doCopyTwoSecRedo(text: string, fn: () => void) {
-    fn();
-    useClipboard()
-      .copy(text)
-      .then(() => setTimeout(fn, 2000));
+  showSeedPhrase() {
+    this.showSeed = true;
   }
 }
 </script>

src/views/SharedPhotoView.vue

@@ -1,228 +0,0 @@
-<template>
-  <QuickNav />
-  <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
-    <!-- Heading -->
-    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
-      Image
-    </h1>
-    <div v-if="imageBlob">
-      <div v-if="uploading" class="text-center mb-4">
-        <fa icon="spinner" class="fa-spin-pulse" />
-      </div>
-      <div v-else>
-        <div class="text-center mb-4">Choose how to use this image</div>
-        <div class="grid grid-cols-1 sm:grid-cols-3 gap-4">
-          <button
-            @click="recordGift"
-            class="text-center text-md font-bold 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-2 py-3 rounded-md"
-          >
-            <fa icon="gift" class="fa-fw" />
-            Record a Gift
-          </button>
-          <button
-            @click="recordProfile"
-            class="text-center text-md font-bold 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-2 py-3 rounded-md"
-          >
-            <fa icon="circle-user" class="fa-fw" />
-            Save as Profile Image
-          </button>
-          <button
-            @click="cancel"
-            class="text-center text-md font-bold bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md"
-          >
-            <fa icon="ban" class="fa-fw" />
-            Cancel
-          </button>
-        </div>
-        <PhotoDialog ref="photoDialog" />
-      </div>
-
-      <div class="flex justify-center">
-        <img
-          :src="URL.createObjectURL(imageBlob)"
-          alt="Shared Image"
-          class="rounded mt-4"
-        />
-      </div>
-    </div>
-    <div v-else class="text-center mb-4">
-      <p>No image found.</p>
-      <p class="mt-4">
-        If you shared an image, the cause is usually that you do not have the
-        recent version of this app, or that the app has not refreshed the
-        service code underneath. To fix this, first make sure you have latest
-        version by comparing your version at the bottom of "Help" with the
-        version at the bottom of https://timesafari.app/help in a browser. After
-        that, it may eventually work, but you can speed up the process by
-        clearing your data cache (in the browser on mobile, even if you
-        installed it) and/or reinstalling the app (after backing up all your
-        data, of course).
-      </p>
-    </div>
-  </section>
-</template>
-
-<script lang="ts">
-import axios from "axios";
-import { Component, Vue } from "vue-facing-decorator";
-import { RouteLocationRaw, Router } from "vue-router";
-
-import PhotoDialog from "@/components/PhotoDialog.vue";
-import QuickNav from "@/components/QuickNav.vue";
-import {
-  DEFAULT_IMAGE_API_SERVER,
-  IMAGE_TYPE_PROFILE,
-  NotificationIface,
-} from "@/constants/app";
-import { db } from "@/db/index";
-import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import { accessToken } from "@/libs/crypto";
-import { base64ToBlob, SHARED_PHOTO_BASE64_KEY } from "@/libs/util";
-
-@Component({ components: { PhotoDialog, QuickNav } })
-export default class SharedPhotoView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-
-  activeDid: string | undefined = undefined;
-  imageBlob: Blob | undefined = undefined;
-  imageFileName: string | undefined = undefined;
-  uploading = false;
-
-  URL = window.URL || window.webkitURL;
-
-  // 'created' hook runs when the Vue instance is first created
-  async mounted() {
-    try {
-      await db.open();
-      const settings = await db.settings.get(MASTER_SETTINGS_KEY);
-      this.activeDid = settings?.activeDid as string;
-
-      const temp = await db.temp.get(SHARED_PHOTO_BASE64_KEY);
-      const imageB64 = temp?.blobB64 as string;
-      if (temp) {
-        this.imageBlob = base64ToBlob(imageB64);
-
-        // clear the temp image
-        db.temp.delete(SHARED_PHOTO_BASE64_KEY);
-
-        this.imageFileName = (this.$route as Router).query[
-          "fileName"
-        ] as string;
-      } else {
-        console.error("No appropriate image found in temp storage.", temp);
-      }
-    } catch (err: unknown) {
-      console.error("Got an error loading an identifier:", err);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "Got an error loading this data.",
-        },
-        -1,
-      );
-    }
-  }
-
-  async recordGift() {
-    await this.sendToImageServer("GiveAction").then((url) => {
-      if (url) {
-        const route = {
-          name: "gifted-details",
-          // this might be wrong since "name" goes with params, but it works so test well when you change it
-          query: {
-            destinationPathAfter: "/",
-            hideBackButton: true,
-            imageUrl: url,
-            recipientDid: this.activeDid,
-          },
-        } as RouteLocationRaw;
-        (this.$router as Router).push(route);
-      }
-    });
-  }
-
-  recordProfile() {
-    (this.$refs.photoDialog as PhotoDialog).open(
-      async (imgUrl) => {
-        await db.settings.update(MASTER_SETTINGS_KEY, {
-          profileImageUrl: imgUrl,
-        });
-        (this.$router as Router).push({ name: "account" });
-      },
-      IMAGE_TYPE_PROFILE,
-      true,
-      this.imageBlob,
-      this.imageFileName,
-    );
-  }
-
-  async cancel() {
-    this.imageBlob = undefined;
-    this.imageFileName = undefined;
-    (this.$router as Router).push({ name: "home" });
-  }
-
-  async sendToImageServer(imageType: string) {
-    this.uploading = true;
-
-    let result;
-    try {
-      // send the image to the server
-      const token = await accessToken(this.activeDid);
-      const headers = {
-        Authorization: "Bearer " + token,
-        // axios fills in Content-Type of multipart/form-data
-      };
-      const formData = new FormData();
-      formData.append(
-        "image",
-        this.imageBlob as Blob,
-        this.imageFileName as string,
-      );
-      formData.append("claimType", imageType);
-
-      const response = await axios.post(
-        DEFAULT_IMAGE_API_SERVER + "/image",
-        formData,
-        { headers },
-      );
-      if (response?.data?.url) {
-        this.imageBlob = undefined;
-        this.imageFileName = undefined;
-        result = response.data.url as string;
-      } else {
-        console.error("Problem uploading the image", response.data);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text:
-              "There was a problem saving the picture. " +
-              (response?.data?.message || ""),
-          },
-          5000,
-        );
-      }
-
-      this.uploading = false;
-    } catch (error) {
-      console.error("Error uploading the image", error);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "There was an error saving the picture.",
-        },
-        5000,
-      );
-      this.uploading = false;
-    }
-    return result;
-  }
-}
-</script>

src/views/StartView.vue

@@ -17,7 +17,7 @@
 
       <!-- Heading -->
       <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
-        Generate an Identity
+        Start Here
       </h1>
     </div>
 
@@ -25,58 +25,33 @@
     <div id="start-question" class="mt-8">
       <div class="max-w-3xl mx-auto">
         <p class="text-center text-xl font-light">
-          How do you want to create this identifier?
+          Do you want a new identifier of your own?
         </p>
-        <p v-if="PASSKEYS_ENABLED" class="text-center font-light mt-6">
-          A <strong>passkey</strong> is easy to manage, though it is less
-          interoperable with other systems for advanced uses.
-          <a
-            href="https://www.perplexity.ai/search/what-are-passkeys-v2SHV3yLQlyA2CYH6.Nvhg"
-            target="_blank"
-          >
-            <fa icon="info-circle" class="fa-fw text-blue-500" />
-          </a>
+        <p class="text-center font-light">
+          If you haven't used this before, click "Yes" to generate a new
+          identifier.
         </p>
-        <p class="text-center font-light mt-4">
-          A <strong>new seed</strong> allows you full control over the keys,
-          though you are responsible for backups.
-          <a
-            href="https://www.perplexity.ai/search/what-is-a-seed-phrase-OqiP9foVRXidr_2le5OFKA"
-            target="_blank"
-          >
-            <fa icon="info-circle" class="fa-fw text-blue-500" />
-          </a>
+        <p class="text-center mb-4 font-light">
+          Only click "No" if you have a seed of 12 or 24 words generated
+          elsewhere.
         </p>
-        <div class="grid grid-cols-1 sm:grid-cols-2 gap-2 mt-4">
-          <a
-            v-if="PASSKEYS_ENABLED"
-            @click="onClickNewPasskey()"
-            class="block w-full text-center text-lg 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-2 py-3 rounded-md mb-2 cursor-pointer"
-          >
-            Generate one with a passkey
-          </a>
-          <a
-            @click="onClickNewSeed()"
-            class="block w-full text-center text-lg 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-2 py-3 rounded-md mb-2 cursor-pointer"
-          >
-            Generate one with a new seed
-          </a>
-        </div>
-        <p class="text-center font-light mt-4">
-          You can also import an existing seed or derive a new address from an
-          existing seed.
-        </p>
-        <div class="grid grid-cols-1 sm:grid-cols-2 gap-2 mt-2">
+        <a
+          @click="onClickYes()"
+          class="block w-full text-center text-lg 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-2 py-3 rounded-md mb-2"
+        >
+          Yes, generate one
+        </a>
+        <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
           <a
             @click="onClickNo()"
-            class="block w-full text-center 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-1.5 py-2 rounded-md cursor-pointer"
+            class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
           >
-            You have a seed
+            No, I have a seed
           </a>
           <a
             v-if="numAccounts > 0"
             @click="onClickDerive()"
-            class="block w-full text-center 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-1.5 py-2 rounded-md cursor-pointer"
+            class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
           >
             Derive new address from existing seed
           </a>
@@ -88,48 +63,29 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
-
-import { AppString, PASSKEYS_ENABLED } from "@/constants/app";
-import { accountsDB, db } from "@/db/index";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
-import { registerSaveAndActivatePasskey } from "@/libs/util";
+import { accountsDB } from "@/db/index";
 
 @Component({
   components: {},
 })
 export default class StartView extends Vue {
-  PASSKEYS_ENABLED = PASSKEYS_ENABLED;
-
-  givenName = "";
   numAccounts = 0;
 
   async mounted() {
-    await db.open();
-    const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
-    this.givenName = settings?.firstName || "";
-
     await accountsDB.open();
     this.numAccounts = await accountsDB.accounts.count();
   }
 
-  public onClickNewSeed() {
-    (this.$router as Router).push({ name: "new-identifier" });
-  }
-
-  public async onClickNewPasskey() {
-    const keyName =
-      AppString.APP_NAME + (this.givenName ? " - " + this.givenName : "");
-    await registerSaveAndActivatePasskey(keyName);
-    (this.$router as Router).push({ name: "account" });
+  public onClickYes() {
+    this.$router.push({ name: "new-identifier" });
   }
 
   public onClickNo() {
-    (this.$router as Router).push({ name: "import-account" });
+    this.$router.push({ name: "import-account" });
   }
 
   public onClickDerive() {
-    (this.$router as Router).push({ name: "import-derive" });
+    this.$router.push({ name: "import-derive" });
   }
 }
 </script>

src/views/TestView.vue

@@ -21,8 +21,8 @@
       </h1>
     </div>
 
-    <div>
-      <h2 class="text-xl font-bold mb-4">Notiwind Alerts</h2>
+    <div class="mb-8">
+      <h2 class="text-xl font-bold mb-4">Notiwind Alert Test Suite</h2>
 
       <button
         @click="
@@ -153,316 +153,13 @@
         Notif OFF
       </button>
     </div>
-
-    <div class="mt-8">
-      <h2 class="text-xl font-bold mb-4">Image Sharing</h2>
-      Populates the "shared-photo" view as if they used "share_target".
-      <input type="file" data-testid="fileInput" @change="uploadFile" />
-      <router-link
-        v-if="showFileNextStep()"
-        :to="{
-          name: 'shared-photo',
-          query: { fileName },
-        }"
-        class="block w-full text-center text-md bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mb-2 mt-2"
-        data-testid="fileUploadButton"
-      >
-        Go to Shared Page
-      </router-link>
-    </div>
-
-    <div class="mt-8">
-      <h2 class="text-xl font-bold mb-4">Passkeys</h2>
-      See console for results.
-      <br />
-      See existing passkeys in Chrome at: chrome://settings/passkeys
-      <br />
-      Active DID: {{ activeDid || "nothing, which" }}
-      {{ credIdHex ? "has a passkey ID" : "has no passkey ID" }}
-
-      <div>
-        Register Passkey
-        <button
-          @click="register()"
-          class="font-bold uppercase bg-slate-500 text-white px-3 py-2 rounded-md mr-2"
-        >
-          Simplewebauthn
-        </button>
-      </div>
-
-      <div>
-        Create JWT
-        <button
-          @click="createJwtSimplewebauthn()"
-          class="font-bold uppercase bg-slate-500 text-white px-3 py-2 rounded-md mr-2"
-        >
-          Simplewebauthn
-        </button>
-        <button
-          @click="createJwtNavigator()"
-          class="font-bold uppercase bg-slate-500 text-white px-3 py-2 rounded-md mr-2"
-        >
-          Navigator
-        </button>
-      </div>
-
-      <div v-if="jwt">
-        Verify New JWT
-        <button
-          @click="verifySimplewebauthn()"
-          class="font-bold uppercase bg-slate-500 text-white px-3 py-2 rounded-md mr-2"
-        >
-          Simplewebauthn
-        </button>
-        <button
-          @click="verifyWebCrypto()"
-          class="font-bold uppercase bg-slate-500 text-white px-3 py-2 rounded-md mr-2"
-        >
-          WebCrypto
-        </button>
-        <button
-          @click="verifyP256()"
-          class="font-bold uppercase bg-slate-500 text-white px-3 py-2 rounded-md mr-2"
-        >
-          p256 - broken
-        </button>
-      </div>
-      <div v-else>Verify New JWT -- requires creation first</div>
-      <button
-        @click="verifyMyJwt()"
-        class="font-bold uppercase bg-slate-500 text-white px-3 py-2 rounded-md mr-2"
-      >
-        Verify Hard-Coded JWT
-      </button>
-    </div>
   </section>
 </template>
 
 <script lang="ts">
-import { Buffer } from "buffer/";
-import { Base64URLString } from "@simplewebauthn/types";
-import { ref } from "vue";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
-
 import QuickNav from "@/components/QuickNav.vue";
-import { AppString, NotificationIface } from "@/constants/app";
-import { accountsDB, db } from "@/db/index";
-import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import * as vcLib from "@/libs/crypto/vc";
-import {
-  PeerSetup,
-  verifyJwtP256,
-  verifyJwtSimplewebauthn,
-  verifyJwtWebCrypto,
-} from "@/libs/crypto/vc/passkeyDidPeer";
-import {
-  AccountKeyInfo,
-  blobToBase64,
-  getAccount,
-  registerAndSavePasskey,
-  SHARED_PHOTO_BASE64_KEY,
-} from "@/libs/util";
-
-const inputFileNameRef = ref<Blob>();
-
-const TEST_PAYLOAD = {
-  vc: {
-    credentialSubject: {
-      "@context": "https://schema.org",
-      "@type": "GiveAction",
-      description: "pizza",
-    },
-  },
-};
 
 @Component({ components: { QuickNav } })
-export default class Help extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-
-  // for file import
-  fileName?: string;
-
-  // for passkeys
-  credIdHex?: string;
-  activeDid?: string;
-  jwt?: string;
-  peerSetup?: PeerSetup;
-  userName?: string;
-
-  async mounted() {
-    await db.open();
-    const settings = await db.settings.get(MASTER_SETTINGS_KEY);
-    this.activeDid = (settings?.activeDid as string) || "";
-    this.userName = settings?.firstName as string;
-
-    await accountsDB.open();
-    const account: { identity?: string } | undefined = await accountsDB.accounts
-      .where("did")
-      .equals(this.activeDid)
-      .first();
-    if (this.activeDid) {
-      if (account) {
-        this.credIdHex = account.passkeyCredIdHex as string;
-      } else {
-        alert("No account found for DID " + this.activeDid);
-      }
-    }
-  }
-
-  async uploadFile(event: Event) {
-    inputFileNameRef.value = event.target?.["files"][0];
-    // https://developer.mozilla.org/en-US/docs/Web/API/File
-    // ... plus it has a `type` property from my testing
-    const file = inputFileNameRef.value;
-    if (file != null) {
-      const reader = new FileReader();
-      reader.onload = async (e) => {
-        const data = e.target?.result as ArrayBuffer;
-        if (data) {
-          const blob = new Blob([new Uint8Array(data)], {
-            type: file.type,
-          });
-          const blobB64 = await blobToBase64(blob);
-          this.fileName = file.name as string;
-          const temp = await db.temp.get(SHARED_PHOTO_BASE64_KEY);
-          if (temp) {
-            await db.temp.update(SHARED_PHOTO_BASE64_KEY, { blobB64 });
-          } else {
-            await db.temp.add({ id: SHARED_PHOTO_BASE64_KEY, blobB64 });
-          }
-        }
-      };
-      reader.readAsArrayBuffer(file as Blob);
-    }
-  }
-
-  showFileNextStep() {
-    return !!inputFileNameRef.value;
-  }
-
-  public async register() {
-    const DEFAULT_USERNAME = AppString.APP_NAME + " Tester";
-    if (!this.userName) {
-      this.$notify(
-        {
-          group: "modal",
-          type: "confirm",
-          title: "No Name",
-          text: "You should have a name to attach to this passkey. Would you like to enter your own name first?",
-          onNo: async () => {
-            this.userName = DEFAULT_USERNAME;
-          },
-          onYes: async () => {
-            (this.$router as Router).push({ name: "new-edit-account" });
-          },
-          noText: "try again and use " + DEFAULT_USERNAME,
-        },
-        -1,
-      );
-      return;
-    }
-    const account = await registerAndSavePasskey(
-      AppString.APP_NAME + " - " + this.userName,
-    );
-    this.activeDid = account.did;
-    this.credIdHex = account.passkeyCredIdHex;
-  }
-
-  public async createJwtSimplewebauthn() {
-    const account: AccountKeyInfo | undefined = await getAccount(
-      this.activeDid || "",
-    );
-    if (!vcLib.isFromPasskey(account)) {
-      alert(`The DID ${this.activeDid} is not passkey-enabled.`);
-      return;
-    }
-    this.peerSetup = new PeerSetup();
-    this.jwt = await this.peerSetup.createJwtSimplewebauthn(
-      this.activeDid as string,
-      TEST_PAYLOAD,
-      this.credIdHex as string,
-    );
-    console.log("simple jwt4url", this.jwt);
-  }
-
-  public async createJwtNavigator() {
-    const account: AccountKeyInfo | undefined = await getAccount(
-      this.activeDid || "",
-    );
-    if (!vcLib.isFromPasskey(account)) {
-      alert(`The DID ${this.activeDid} is not passkey-enabled.`);
-      return;
-    }
-    this.peerSetup = new PeerSetup();
-    this.jwt = await this.peerSetup.createJwtNavigator(
-      this.activeDid as string,
-      TEST_PAYLOAD,
-      this.credIdHex as string,
-    );
-    console.log("lower jwt4url", this.jwt);
-  }
-
-  public async verifyP256() {
-    const decoded = await verifyJwtP256(
-      this.credIdHex as string,
-      this.activeDid as string,
-      this.peerSetup?.authenticatorData as ArrayBuffer,
-      this.peerSetup?.challenge as Uint8Array,
-      this.peerSetup?.clientDataJsonBase64Url as Base64URLString,
-      this.peerSetup?.signature as Base64URLString,
-    );
-    console.log("decoded", decoded);
-  }
-
-  public async verifySimplewebauthn() {
-    const decoded = await verifyJwtSimplewebauthn(
-      this.credIdHex as string,
-      this.activeDid as string,
-      this.peerSetup?.authenticatorData as ArrayBuffer,
-      this.peerSetup?.challenge as Uint8Array,
-      this.peerSetup?.clientDataJsonBase64Url as Base64URLString,
-      this.peerSetup?.signature as Base64URLString,
-    );
-    console.log("decoded", decoded);
-  }
-
-  public async verifyWebCrypto() {
-    const decoded = await verifyJwtWebCrypto(
-      this.credIdHex as string,
-      this.activeDid as string,
-      this.peerSetup?.authenticatorData as ArrayBuffer,
-      this.peerSetup?.challenge as Uint8Array,
-      this.peerSetup?.clientDataJsonBase64Url as Base64URLString,
-      this.peerSetup?.signature as Base64URLString,
-    );
-    console.log("decoded", decoded);
-  }
-
-  public async verifyMyJwt() {
-    const did =
-      "did:peer:0zKMFjvUgYrM1hXwDciYHiA9MxXtJPXnRLJvqoMNAKoDLX9pKMWLb3VDsgua1p2zW1xXRsjZSTNsfvMnNyMS7dB4k7NAhFwL3pXBrBXgyYJ9ri";
-    const jwt =
-      "eyJ0eXAiOiJKV0FOVCIsImFsZyI6IkVTMjU2In0.eyJBdXRoZW50aWNhdGlvbkRhdGFCNjRVUkwiOiJTWllONVlnT2pHaDBOQmNQWkhaZ1c0X2tycm1paGpMSG1Wenp1b01kbDJNRkFBQUFBQSIsIkNsaWVudERhdGFKU09OQjY0VVJMIjoiZXlKMGVYQmxJam9pZDJWaVlYVjBhRzR1WjJWMElpd2lZMmhoYkd4bGJtZGxJam9pWlhsS01sbDVTVFpsZVVwcVkyMVdhMXBYTlRCaFYwWnpWVE5XYVdGdFZtcGtRMGsyWlhsS1FWa3lPWFZrUjFZMFpFTkpOa2x0YURCa1NFSjZUMms0ZG1NeVRtOWFWekZvVEcwNWVWcDVTWE5KYTBJd1pWaENiRWxxYjJsU01td3lXbFZHYW1SSGJIWmlhVWx6U1cxU2JHTXlUbmxoV0VJd1lWYzVkVWxxYjJsalIydzJaVzFGYVdaWU1ITkpiV3hvWkVOSk5rMVVZM2hQUkZVMFRtcHJOVTFEZDJsaFdFNTZTV3B2YVZwSGJHdFBia0pzV2xoSk5rMUljRXhVVlZweFpHeFdibGRZU2s1TlYyaFpaREJTYW1GV2JFbGhWVVUxVkZob1dXUkZjRkZYUnpWVFZFVndNbU5YT1U1VWEwWk1ZakJTVFZkRWJIZFRNREZZVkVkSmVsWnJVbnBhTTFab1RWaEJlV1ZzWTNobFJtaFRZekp3WVZVeFVrOWpNbG95VkZjMVQyVlZNVlJPTWxKRFRrZHpNMVJyUm05U2JtUk5UVE5DV1ZGdVNrTlhSMlExVjFWdk5XTnRhMmxtVVNJc0ltOXlhV2RwYmlJNkltaDBkSEE2THk5c2IyTmhiR2h2YzNRNk9EQTRNQ0lzSW1OeWIzTnpUM0pwWjJsdUlqcG1ZV3h6WlgwIiwiaWF0IjoxNzE4NTg2OTkyLCJpc3MiOiJkaWQ6cGVlcjowektNRmp2VWdZck0xaFh3RGNpWUhpQTlNeFh0SlBYblJMSnZxb01OQUtvRExYOXBLTVdMYjNWRHNndWExcDJ6VzF4WFJzalpTVE5zZnZNbk55TVM3ZEI0azdOQWhGd0wzcFhCckJYZ3lZSjlyaSJ9.MEUCIQDJyCTbMPIFnuBoW3FYnlgtDEIHZ2OrkCEvqVnHU7kJDQIgVxjBjfW1TwQfcSOYwK8Z7AdCWGJlyxtLEsrnPif7caE";
-    const pieces = jwt.split(".");
-    const payload = JSON.parse(Buffer.from(pieces[1], "base64").toString());
-    const authData = Buffer.from(payload["AuthenticationDataB64URL"], "base64");
-    const clientJSON = Buffer.from(
-      payload["ClientDataJSONB64URL"],
-      "base64",
-    ).toString();
-    const clientData = JSON.parse(clientJSON);
-    const challenge = clientData.challenge;
-    const signatureB64URL = pieces[2];
-    const decoded = await verifyJwtWebCrypto(
-      this.credIdHex as string,
-      did,
-      authData,
-      challenge,
-      payload["ClientDataJSONB64URL"],
-      signatureB64URL,
-    );
-    console.log("decoded", decoded);
-  }
-}
+export default class Help extends Vue {}
 </script>

src/vite-env.d.ts

@@ -1,10 +0,0 @@
-/// <reference types="vite/client" />
-
-interface ImportMetaEnv {
-  readonly VITE_APP_TITLE: string;
-  // more env variables...
-}
-
-interface ImportMeta {
-  readonly env: ImportMetaEnv;
-}

sw_scripts/additional-scripts.js

@@ -81,7 +81,7 @@ self.addEventListener("push", function (event) {
           } else {
             title = payload.title || "Update";
           }
-          // getNotificationCount is injected from safari-notifications.js at build time by the sw_combine.js script
+          // getNotificationCount is injected from safari-notifications.js at build time by the vue.config.js configureWebpack apply plugin
           // eslint-disable-next-line no-undef
           message = await getNotificationCount();
         }
@@ -112,51 +112,8 @@ self.addEventListener("message", (event) => {
   logConsoleAndDb("Service worker posted a message.");
 });
 
-self.addEventListener("notificationclick", (event) => {
-  logConsoleAndDb("Notification got clicked.", event);
-  event.notification.close();
-  // from https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorkerGlobalScope/notificationclick_event
-  // ... though I don't see any benefit over just "clients.openWindow"
-  event.waitUntil(
-    clients
-      .matchAll({
-        type: "window",
-      })
-      .then((clientList) => {
-        for (const client of clientList) {
-          if (client.url === "/" && "focus" in client) return client.focus();
-        }
-        if (clients.openWindow) return clients.openWindow("/");
-      }),
-  );
-});
-
-// This is invoked when the user chooses this as a share_target, mapped to share-target in the manifest.
 self.addEventListener("fetch", (event) => {
   logConsoleAndDb("Service worker got fetch event.", event);
-
-  // Bypass any regular requests not related to Web Share Target
-  // and also requests that are not exactly to the timesafari.app
-  // (note that Chrome will send subdomain requests like image-api.timesafari.app through this service worker).
-  if (
-    event.request.method !== "POST" ||
-    !event.request.url.endsWith("/share-target")
-  ) {
-    event.respondWith(fetch(event.request));
-    return;
-  }
-
-  // Requests related to Web Share share-target Target.
-  event.respondWith(
-    (async () => {
-      const formData = await event.request.formData();
-      const photo = formData.get("photo");
-      // savePhoto is injected from safari-notifications.js at build time by the sw_combine.js script
-      // eslint-disable-next-line no-undef
-      await savePhoto(photo);
-      return Response.redirect("/shared-photo", 303);
-    })(),
-  );
 });
 
 self.addEventListener("error", (event) => {

sw_scripts/safari-notifications.js

@@ -566,33 +566,6 @@ async function getNotificationCount() {
   return result;
 }
 
-async function blobToBase64String(blob) {
-  return new Promise((resolve, reject) => {
-    const reader = new FileReader();
-    reader.onloadend = () => resolve(reader.result); // potential problem if it returns an ArrayBuffer?
-    reader.onerror = reject;
-    reader.readAsDataURL(blob);
-  });
-}
-
-// Store the image blob and go immediate to a page to upload it.
-// @param photo - image Blob to store for later retrieval after redirect
-async function savePhoto(photo) {
-  try {
-    const photoBase64 = await blobToBase64String(photo);
-    const db = await openIndexedDB("TimeSafari");
-    const transaction = db.transaction("temp", "readwrite");
-    const store = transaction.objectStore("temp");
-    await updateRecord(store, {
-      id: "shared-photo-base64",
-      blobB64: photoBase64,
-    });
-    transaction.oncomplete = () => db.close();
-  } catch (error) {
-    console.error("safari-notifications logMessage IndexedDB error", error);
-  }
-}
-
 self.appendDailyLog = appendDailyLog;
 self.getNotificationCount = getNotificationCount;
 self.decodeBase64 = decodeBase64;

test-playwright/.eslintrc.js

@@ -1,16 +0,0 @@
-module.exports = {
-  root: true,
-  parserOptions: {
-    ecmaVersion: 12,
-    sourceType: 'module',
-    requireConfigFile: false,
-  },
-  plugins: [],
-  rules: {
-    quotes: [
-      'error',
-      'single',
-      { avoidEscape: true, allowTemplateLiterals: true },
-    ],
-  },
-};

test-playwright/00-noid-tests.spec.ts

@@ -1,81 +0,0 @@
-import { test, expect } from '@playwright/test';
-
-test('Confirm usage of test API (may fail if you are running your own Time Safari)', async ({ page }, testInfo) => {
-  // Load account view
-  await page.goto('./account');
-  await page.getByRole('heading', { name: 'Advanced' }).click();
-
-  // look into the config file: if it starts Time Safari, it might say which server it should set by default
-  const webServer = testInfo.config.webServer;
-  const endorserWords = webServer?.command.split(' ');
-  const ENDORSER_ENV_NAME = 'VITE_DEFAULT_ENDORSER_API_SERVER';
-  const endorserTerm = endorserWords?.find(word => word.startsWith(ENDORSER_ENV_NAME + '='));
-  const endorserTermInConfig = endorserTerm?.substring(ENDORSER_ENV_NAME.length + 1);
-
-  const endorserServer = endorserTermInConfig || 'https://test-api.endorser.ch';
-  await expect(page.getByRole('textbox').nth(1)).toHaveValue(endorserServer);
-});
-
-test('Check activity feed', async ({ page }) => {
-  // Load app homepage
-  await page.goto('./');
-
-  // Check that initial 10 activities have been loaded
-  await page.locator('ul#listLatestActivity li:nth-child(10)');
-
-  // Scroll down a bit to trigger loading additional activities
-  await page.locator('ul#listLatestActivity li:nth-child(50)').scrollIntoViewIfNeeded();
-});
-
-test('Check discover results', async ({ page }) => {
-  // Load Discover view
-  await page.goto('./discover');
-
-  // Check that initial 10 projects have been loaded
-  await page.locator('ul#listDiscoverResults li.border-b:nth-child(10)');
-
-  // Scroll down a bit to trigger loading additional projects
-  await page.locator('ul#listDiscoverResults li.border-b:nth-child(20)').scrollIntoViewIfNeeded();
-});
-
-test('Check no-ID messaging in homepage', async ({ page }) => {
-  // Load app homepage
-  await page.goto('./');
-
-  // Check 'someone must register you' notice
-  await expect(page.getByText('To share, someone must register you.')).toBeVisible();
-});
-
-test('Check no-ID messaging in account', async ({ page }) => {
-  // Load account view
-  await page.goto('./account');
-
-  // Check 'someone must register you' notice
-  await expect(page.locator('#noticeBeforeShare')).toBeVisible();
-
-  // Check 'a friend needs to register you' notice
-  await expect(page.locator('#noticeBeforeAnnounce')).toBeVisible();
-
-  // Check that there is no ID
-  await expect(page.locator('#sectionIdentityDetails code.truncate')).toBeEmpty();
-});
-
-test('Check ID generation', async ({ page }) => {
-  // Load Account view
-  await page.goto('./account');
-
-  // Check that ID is empty
-  await expect(page.locator('#sectionIdentityDetails code.truncate')).toBeEmpty();
-
-  // Load homepage to trigger ID generation (?)
-  await page.goto('./');
-
-  // Wait for activity feed to start loading, as a delay
-  await expect(page.locator('ul#listLatestActivity li:nth-child(10)')).toBeVisible();
-
-  // Go back to Account view
-  await page.goto('./account');
-
-  // Check that ID is now generated
-  await expect(page.locator('#sectionIdentityDetails code.truncate')).toContainText('did:ethr:');
-});

test-playwright/10-check-usage-limits.spec.ts

@@ -1,18 +0,0 @@
-import { test, expect } from '@playwright/test';
-import { importUser } from './testUtils';
-
-test('Check usage limits', async ({ page }) => {
-  // Check without ID first
-  await page.goto('./account');
-  await expect(page.locator('div.bg-slate-100.rounded-md').filter({ hasText: 'Usage Limits' })).toBeHidden();
-
-  // Import user 01
-  await importUser(page, '01');
-
-  // Verify that "Usage Limits" section is visible
-  await expect(page.locator('#sectionUsageLimits')).toBeVisible();
-  await expect(page.getByText('Your claims counter resets')).toBeVisible();
-  await expect(page.getByText('Your registration counter resets')).toBeVisible();
-  await expect(page.getByText('Your image counter resets')).toBeVisible();
-  await expect(page.getByRole('button', { name: 'Recheck Limits' })).toBeVisible();
-});

test-playwright/20-create-project.spec.ts

@@ -1,53 +0,0 @@
-import { test, expect } from '@playwright/test';
-import { importUser } from './testUtils';
-
-test('Create new project, then search for it', async ({ page }) => {
-  // Generate a random string of 16 characters
-  let randomString = Math.random().toString(36).substring(2, 18);
-
-  // In case the string is shorter than 16 characters, generate more characters until it is 16 characters long
-  while (randomString.length < 16) {
-    randomString += Math.random().toString(36).substring(2, 18);
-  }
-  const finalRandomString = randomString.substring(0, 16);
-
-  // Standard texts
-  const standardTitle = "Idea ";
-  const standardDescription = "Description of Idea ";
-
-  // Combine texts with the random string
-  const finalTitle = standardTitle + finalRandomString;
-  const finalDescription = standardDescription + finalRandomString;
-
-  // Import user 00
-  await importUser(page, '00');
-
-  // Pause for 5 seconds
-  await page.waitForTimeout(5000); // I have to wait, otherwise the (+) button to add a new project doesn't appear
-
-  // Create new project
-  await page.goto('./projects');
-  await page.getByRole('link', { name: 'Projects', exact: true }).click();
-  await page.getByRole('button').click();
-  await page.getByPlaceholder('Idea Name').fill(finalTitle); // Add random suffix
-  await page.getByPlaceholder('Description').fill(finalDescription);
-  await page.getByPlaceholder('Website').fill('https://example.com');
-  await page.getByPlaceholder('Start Date').fill('2025-12-01');
-  await page.getByPlaceholder('Start Time').fill('12:00');
-  await page.getByRole('button', { name: 'Save Project' }).click();
-
-  // Check texts
-  await expect(page.locator('h2')).toContainText(finalTitle);
-  await expect(page.locator('#Content')).toContainText(finalDescription);
-
-  // Search for newly-created project in /projects
-  await page.goto('./projects');
-  await page.getByRole('link', { name: 'Projects', exact: true }).click();
-  await expect(page.locator('ul#listProjects li.border-b:nth-child(1)')).toContainText(finalRandomString); // Assumes newest project always appears first in the Projects tab list
-
-  // Search for newly-created project in /discover
-  await page.goto('./discover');
-  await page.getByPlaceholder('Search…').fill(finalRandomString);
-  await page.locator('#QuickSearch button').click();
-  await expect(page.locator('ul#listDiscoverResults li.border-b:nth-child(1)')).toContainText(finalRandomString);
-});

test-playwright/30-record-gift.spec.ts

@@ -1,42 +0,0 @@
-import { test, expect } from '@playwright/test';
-import { importUser } from './testUtils';
-
-test('Record something given', async ({ page }) => {
-  // Generate a random string of 16 characters
-  let randomString = Math.random().toString(36).substring(2, 18);
-
-  // In case the string is shorter than 16 characters, generate more characters until it is 16 characters long
-  while (randomString.length < 16) {
-    randomString += Math.random().toString(36).substring(2, 18);
-  }
-  const finalRandomString = randomString.substring(0, 16);
-
-  // Generate a random non-zero single-digit number
-  const randomNonZeroNumber = Math.floor(Math.random() * 99) + 1;
-
-  // Standard title prefix
-  const standardTitle = "Gift ";
-
-  // Combine title prefix with the random string
-  const finalTitle = standardTitle + finalRandomString;
-
-  // Import user 00
-  await importUser(page, '00');
-
-  // Record something given
-  await page.goto('./');
-  await page.getByRole('heading', { name: 'Unnamed/Unknown' }).click();
-  await page.getByPlaceholder('What was given').fill(finalTitle);
-  await page.getByRole('spinbutton').fill(randomNonZeroNumber.toString());
-  await page.getByRole('button', { name: 'Sign & Send' }).click();
-  await expect(page.getByText('That gift was recorded.')).toBeVisible();
-
-  // Refresh home view and check gift
-  await page.goto('./');
-  await page.locator('li').filter({ hasText: finalTitle }).locator('a').click();
-  await expect(page.getByRole('heading', { name: 'Verifiable Claim Details' })).toBeVisible();
-  await expect(page.getByText(finalTitle, { exact: true })).toBeVisible();
-  const page1Promise = page.waitForEvent('popup');
-  await page.getByRole('link', { name: 'View on the Public Server' }).click();
-  const page1 = await page1Promise;
-});

test-playwright/35-record-gift-from-image-share.spec.ts

@@ -1,69 +0,0 @@
-import path from 'path';
-import { test, expect } from '@playwright/test';
-import { importUser } from './testUtils';
-
-test('Record item given from image-share', async ({ page }) => {
-
-  let randomString = Math.random().toString(36).substring(2, 8);
-
-  // Combine title prefix with the random string
-  const finalTitle = `Gift ${randomString} from image-share`;
-
-  await importUser(page, '00');
-
-  // Record something given
-  await page.goto('./test');
-
-  const fileChooserPromise = page.waitForEvent('filechooser');
-  await page.getByTestId('fileInput').click();
-  const fileChooser = await fileChooserPromise;
-  await fileChooser.setFiles(path.join(__dirname, '..', 'public', 'img', 'icons', 'android-chrome-192x192.png'));
-  await page.getByTestId('fileUploadButton').click();
-
-  // on shared photo page, choose the gift option
-  await page.getByRole('button').filter({ hasText: /gift/i }).click();
-
-  await page.getByTestId('imagery').getByRole('img').isVisible();
-  await page.getByPlaceholder('What was received').fill(finalTitle);
-  await page.getByRole('spinbutton').fill('2');
-  await page.getByRole('button', { name: 'Sign & Send' }).click();
-  await expect(page.getByText('That gift was recorded.')).toBeVisible();
-
-
-  // Refresh home view and check gift
-  await page.goto('./');
-  const item1 = page.locator('li').filter({ hasText: finalTitle });
-  await expect(item1.getByRole('img')).toBeVisible();
-});
-
-// // I believe there's a way to test this service worker feature.
-// // The following is what I got from ChatGPT. I wonder if it doesn't work because it's not registering the service worker correctly.
-//
-// test('Trigger a photo-sharing fetch event in service worker with POST to /share-target', async ({ page }) => {
-//   await importUser(page, '00');
-//
-//   // Create a FormData object with a photo
-//   const photoPath = path.join(__dirname, '..', 'public', 'img', 'icons', 'android-chrome-192x192.png');
-//   const photoContent = await fs.readFileSync(photoPath);
-//   const [response] = await Promise.all([
-//     page.waitForResponse(response => response.url().includes('/share-target')), // also check for response.status() === 303 ?
-//     page.evaluate(async (photoContent) => {
-//       const formData = new FormData();
-//       formData.append('photo', new Blob([photoContent], { type: 'image/png' }), 'test-photo.jpg');
-//
-//       const response = await fetch('/share-target', {
-//         method: 'POST',
-//         body: formData,
-//       });
-//
-//       return response;
-//     }, photoContent)
-//   ]);
-//
-//   // Verify the response redirected to /shared-photo
-//   //expect(response.status).toBe(303);
-//   console.log('response headers', response.headers());
-//   console.log('response status', response.status());
-//   console.log('response url', response.url());
-//   expect(response.url()).toContain('/shared-photo');
-// });

test-playwright/40-add-contact.spec.ts

@@ -1,85 +0,0 @@
-import { test, expect } from '@playwright/test';
-import { importUser } from './testUtils';
-
-test('Add contact, record gift, confirm gift', async ({ page }) => {
-  // Generate a random string of 16 characters
-  let randomString = Math.random().toString(36).substring(2, 18);
-
-  // In case the string is shorter than 16 characters, generate more characters until it is 16 characters long
-  while (randomString.length < 16) {
-    randomString += Math.random().toString(36).substring(2, 18);
-  }
-  const finalRandomString = randomString.substring(0, 16);
-
-  // Generate a random non-zero single-digit number
-  const randomNonZeroNumber = Math.floor(Math.random() * 99) + 1;
-
-  // Standard title prefix
-  const standardTitle = "Gift ";
-
-  // Combine title prefix with the random string
-  const finalTitle = standardTitle + finalRandomString;
-
-  // Contact name
-  const contactName = 'Contact 00';
-
-  // Import user 01
-  await importUser(page, '01');
-
-  // Add new contact 00
-  await page.goto('./contacts');
-  await page.getByPlaceholder('URL or DID, Name, Public Key').fill('did:ethr:0x0000694B58C2cC69658993A90D3840C560f2F51F');
-  await page.locator('button > svg.fa-plus').click();
-  await expect(page.locator('div[role="alert"]')).toBeVisible();
-  
-  // Why doesn't the alert box come up every time?
-  // await page.locator('div[role="alert"] button:has-text("Yes")').click();
-
-  // Verify added contact
-  await expect(page.locator('li.border-b')).toContainText('did:ethr:0x0000694B58C2cC69658993A90D3840C560f2F51F');
-
-  // Rename contact
-  await page.locator('li.border-b h2 > button[title="Edit"]').click();
-  await expect(page.locator('div.dialog-overlay > div.dialog').filter({ hasText: 'Edit Name' })).toBeVisible();
-  await page.getByPlaceholder('Name', { exact: true }).fill(contactName);
-  await page.locator('.dialog > .flex > button').first().click();
-
-  // Confirm that home shows contact in "Record Something…"
-  await page.goto('./');
-  await expect(page.locator('#sectionRecordSomethingGiven ul li').filter({ hasText: contactName }).nth(0)).toBeVisible();
-
-  // Record something given by new contact
-  await page.getByRole('heading', { name: contactName }).click();
-  await page.getByPlaceholder('What was given').fill(finalTitle);
-  await page.getByRole('spinbutton', { id: 'inputGivenAmount' }).fill(randomNonZeroNumber.toString());
-  await page.getByRole('button', { name: 'Sign & Send' }).click();
-  await expect(page.getByText('That gift was recorded.')).toBeVisible();
-
-  // Refresh home view and check gift
-  await page.goto('./');
-  await page.locator('li').filter({ hasText: finalTitle }).locator('a').click();
-  await expect(page.getByRole('heading', { name: 'Verifiable Claim Details' })).toBeVisible();
-  await expect(page.getByText(finalTitle, { exact: true })).toBeVisible();
-
-  // Switch to user 00
-  await page.goto('./account');
-  await page.getByRole('heading', { name: 'Advanced' }).click();
-  await page.getByRole('link', { name: 'Switch Identifier' }).click();
-  await page.getByRole('link', { name: 'Add Another Identity…' }).click();
-  await page.getByText('You have a seed').click();
-  await page.getByPlaceholder('Seed Phrase').fill('rigid shrug mobile smart veteran half all pond toilet brave review universe ship congress found yard skate elite apology jar uniform subway slender luggage');
-  await page.getByRole('button', { name: 'Import' }).click();
-
-  // Go to home view and look for gift
-  await page.goto('./');
-  await page.locator('li').filter({ hasText: finalTitle }).locator('a').click();
-
-  // Confirm gift as user 00
-  await page.getByRole('button', { name: 'Confirm' }).click();
-  await page.getByRole('button', { name: 'Yes' }).click();
-  await expect(page.getByText('Confirmation submitted.')).toBeVisible();
-
-  // Refresh claim page, Confirm button should be hidden
-  await page.reload();
-  await expect(page.getByRole('button', { name: 'Confirm' })).toBeHidden();
-});

test-playwright/50-record-offer.spec.ts

@@ -1,62 +0,0 @@
-import { test, expect } from '@playwright/test';
-import { importUser } from './testUtils';
-
-test('Record an offer', async ({ page }) => {
-  // Generate a random string of 6 characters, skipping the "0." at the beginning
-  const randomString = Math.random().toString(36).substring(2, 8);
-  // Standard title prefix
-  const finalTitle = `Offering of ${randomString}`;
-  const randomNonZeroNumber = Math.floor(Math.random() * 998) + 1;
-
-  // Create new ID for default user
-  await importUser(page);
-
-  // Select a project
-  await page.goto('./discover');
-  await page.locator('ul#listDiscoverResults li:nth-child(1)').click();
-
-  // Record an offer
-  await page.getByTestId('offerButton').click();
-  await page.getByTestId('inputDescription').fill(finalTitle);
-  await page.getByTestId('inputOfferAmount').fill(randomNonZeroNumber.toString());
-  await page.getByRole('button', { name: 'Sign & Send' }).click();
-  await expect(page.getByText('That offer was recorded.')).toBeVisible();
-
-  // go to the offer and check the values
-  await page.goto('./projects');
-  await page.locator('li').filter({ hasText: finalTitle }).locator('a').first().click();
-  await expect(page.getByRole('heading', { name: 'Verifiable Claim Details' })).toBeVisible();
-  await expect(page.getByText(finalTitle, { exact: true })).toBeVisible();
-  const serverPagePromise = page.waitForEvent('popup');
-  await page.getByRole('link', { name: 'View on the Public Server' }).click();
-  const serverPage = await serverPagePromise;
-  await serverPage.getByText(finalTitle);
-  await serverPage.getByText('did:none:HIDDEN');
-
-  // Now update that offer
-
-  // find the edit page and check the old values again
-  await page.goto('./projects');
-  await page.locator('li').filter({ hasText: finalTitle }).locator('a').first().click();
-  await page.getByTestId('editClaimButton').click();
-  await page.locator('heading', { hasText: 'What was offered' }).isVisible();
-  const itemDesc = await page.getByTestId('itemDescription');
-  await expect(itemDesc).toHaveValue(finalTitle);
-  const amount = await page.getByTestId('inputOfferAmount');
-  await expect(amount).toHaveValue(randomNonZeroNumber.toString());
-  // update the values
-  await itemDesc.fill('Updated ' + finalTitle);
-  await amount.fill(String(randomNonZeroNumber + 1));
-  await page.getByRole('button', { name: 'Sign & Send' }).click();
-
-  // go to the offer claim again and check the updated values
-  await page.goto('./projects');
-  await page.locator('li').filter({ hasText: finalTitle }).locator('a').first().click();
-  const newItemDesc = await page.getByTestId('description');
-  await expect(newItemDesc).toHaveText(finalTitle);
-
-  // go to edit page
-  await page.getByTestId('editClaimButton').click();
-  const newAmount = await page.getByTestId('inputOfferAmount');
-  await expect(newAmount).toHaveValue(randomNonZeroNumber.toString());
-});

test-playwright/testUtils.js

@@ -1,34 +0,0 @@
-import { expect } from '@playwright/test';
-
-export async function importUser(page, id) {
-  let seedPhrase, userName, did;
-
-  // Set seed phrase and DID based on user ID
-  switch(id) {
-    case '01':
-      seedPhrase = 'island fever beef wine urban aim vacant quit afford total poem flame service calm better adult neither color gaze forum month sister imitate excite';
-      userName = 'User One';
-      did = 'did:ethr:0x111d15564f824D56C7a07b913aA7aDd03382aA39';
-      break;
-    default: // to user 00
-      seedPhrase = 'rigid shrug mobile smart veteran half all pond toilet brave review universe ship congress found yard skate elite apology jar uniform subway slender luggage';
-      userName = 'User Zero';
-      did = 'did:ethr:0x0000694B58C2cC69658993A90D3840C560f2F51F';
-  }
-
-  // Import ID
-  await page.goto('./start');
-  await page.getByText('You have a seed').click();
-  await page.getByPlaceholder('Seed Phrase').fill(seedPhrase);
-  await page.getByRole('button', { name: 'Import' }).click();
-  await expect(page.locator('#sectionUsageLimits')).toContainText('You have done');
-  await expect(page.locator('#sectionUsageLimits')).toContainText('You have uploaded');
-
-  // Set name
-  await page.getByRole('link', { name: 'Set Your Name' }).click();
-  await page.getByPlaceholder('Name').fill(userName);
-  await page.getByRole('button', { name: 'Save Changes' }).click();
-
-  // Check DID
-  await expect(page.getByRole('code')).toContainText(did);
-}