From 9ac9f1d4a31a9617a9bbc890a728e75dfd1effb4 Mon Sep 17 00:00:00 2001 From: Trent Larson Date: Sat, 18 Oct 2025 17:18:02 -0600 Subject: [PATCH 1/7] feat: add first cut at emojis in feed (incomplete because it doesn't detect user's emojis correctly) --- package-lock.json | 28 +++- package.json | 1 + src/components/ActivityListItem.vue | 204 ++++++++++++++++++++++++++-- src/interfaces/common.ts | 2 +- src/interfaces/records.ts | 1 + src/views/HomeView.vue | 5 + 6 files changed, 226 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index 04d2b408..432cb310 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "timesafari", - "version": "1.1.0-beta", + "version": "1.1.1-beta", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "timesafari", - "version": "1.1.0-beta", + "version": "1.1.1-beta", "dependencies": { "@capacitor-community/electron": "^5.0.1", "@capacitor-community/sqlite": "6.0.2", @@ -61,6 +61,7 @@ "did-resolver": "^4.1.0", "dotenv": "^16.0.3", "electron-builder": "^26.0.12", + "emoji-mart-vue-fast": "^15.0.5", "ethereum-cryptography": "^2.1.3", "ethereumjs-util": "^7.1.5", "jdenticon": "^3.2.0", @@ -1864,7 +1865,6 @@ "version": "7.28.3", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.3.tgz", "integrity": "sha512-9uIQ10o0WGdpP6GDhXcdOJPJuDgFtIDtN/9+ArJQ2NAfAmiuhTQdzkaTGR33v43GYS2UrSA0eX2pPPHoFVvpxA==", - "devOptional": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -14990,6 +14990,16 @@ "devOptional": true, "license": "MIT" }, + "node_modules/core-js": { + "version": "3.46.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.46.0.tgz", + "integrity": "sha512-vDMm9B0xnqqZ8uSBpZ8sNtRtOdmfShrvT6h2TuQGLs0Is+cR0DYbj/KWP6ALVNbWPpqA/qPLoOuppJN07humpA==", + "hasInstallScript": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/core-js" + } + }, "node_modules/core-js-compat": { "version": "3.45.0", "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.45.0.tgz", @@ -16422,6 +16432,18 @@ "url": "https://github.com/sindresorhus/emittery?sponsor=1" } }, + "node_modules/emoji-mart-vue-fast": { + "version": "15.0.5", + "resolved": "https://registry.npmjs.org/emoji-mart-vue-fast/-/emoji-mart-vue-fast-15.0.5.tgz", + "integrity": "sha512-wnxLor8ggpqshoOPwIc33MdOC3A1XFeDLgUwYLPtNPL8VeAtXJAVrnFq1CN5PeCYAFoLo4IufHQZ9CfHD4IZiw==", + "dependencies": { + "@babel/runtime": "^7.18.6", + "core-js": "^3.23.5" + }, + "peerDependencies": { + "vue": ">2.0.0" + } + }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", diff --git a/package.json b/package.json index a9587886..1d5ab589 100644 --- a/package.json +++ b/package.json @@ -190,6 +190,7 @@ "did-resolver": "^4.1.0", "dotenv": "^16.0.3", "electron-builder": "^26.0.12", + "emoji-mart-vue-fast": "^15.0.5", "ethereum-cryptography": "^2.1.3", "ethereumjs-util": "^7.1.5", "jdenticon": "^3.2.0", diff --git a/src/components/ActivityListItem.vue b/src/components/ActivityListItem.vue index 6f27be86..063a4c51 100644 --- a/src/components/ActivityListItem.vue +++ b/src/components/ActivityListItem.vue @@ -77,12 +77,66 @@ - -

- +

+
+ +
+ +
+ + + +
+ + +
+ +
+ +
+
+
+ + +

+

import { Component, Prop, Vue, Emit } from "vue-facing-decorator"; -import { GiveRecordWithContactInfo } from "@/interfaces/give"; +import VueMarkdown from "vue-markdown-render"; + +import { logger } from "../utils/logger"; +import { + createAndSubmitClaim, + getHeaders, + isHiddenDid, +} from "../libs/endorserServer"; import EntityIcon from "./EntityIcon.vue"; -import { isHiddenDid } from "../libs/endorserServer"; import ProjectIcon from "./ProjectIcon.vue"; -import { createNotifyHelpers, NotifyFunction } from "@/utils/notify"; +import { createNotifyHelpers, NotifyFunction, TIMEOUTS } from "@/utils/notify"; import { NOTIFY_PERSON_HIDDEN, NOTIFY_UNKNOWN_PERSON, } from "@/constants/notifications"; -import { TIMEOUTS } from "@/utils/notify"; -import VueMarkdown from "vue-markdown-render"; +import { GenericVerifiableCredential } from "@/interfaces"; +import { GiveRecordWithContactInfo } from "@/interfaces/give"; @Component({ components: { @@ -274,15 +334,23 @@ import VueMarkdown from "vue-markdown-render"; }, }) export default class ActivityListItem extends Vue { + readonly QUICK_EMOJIS = ["👍", "👏", "❤️", "🎉", "😊", "😆", "🔥"]; + @Prop() record!: GiveRecordWithContactInfo; @Prop() lastViewedClaimId?: string; @Prop() isRegistered!: boolean; @Prop() activeDid!: string; + @Prop() apiServer!: string; isHiddenDid = isHiddenDid; notify!: ReturnType; $notify!: NotifyFunction; + // Emoji-related data + showEmojiPicker = false; + + userEmojis: string[] | null = null; // load this only when needed + created() { this.notify = createNotifyHelpers(this.$notify); } @@ -346,5 +414,119 @@ export default class ActivityListItem extends Vue { day: "numeric", }); } + + // Emoji-related computed properties and methods + get hasEmojis(): boolean { + return Object.keys(this.record.emojiCount).length > 0; + } + + async loadUserEmojis(): Promise { + try { + const response = await this.axios.get( + `${this.apiServer}/api/v2/emoji/userEmojis?parentHandleId=${this.record.jwtId}`, + { headers: await getHeaders(this.activeDid) }, + ); + this.userEmojis = response.data; + } catch (error) { + logger.error( + "Error loading all emojis for parent handle id:", + this.record.jwtId, + error, + ); + } + } + + async getUserEmojis(): Promise { + if (!this.userEmojis) { + await this.loadUserEmojis(); + } + return this.userEmojis || []; + } + + selectEmoji(emoji: string) { + this.showEmojiPicker = false; + this.submitEmoji(emoji); + } + + isUserEmoji(emoji: string): boolean { + return this.userEmojis?.includes(emoji) || false; + } + + toggleEmoji(emoji: string) { + if (this.isUserEmoji(emoji)) { + this.removeEmoji(emoji); + } else { + this.submitEmoji(emoji); + } + } + + async submitEmoji(emoji: string) { + try { + // Temporarily add to user emojis for UI feedback + if (!this.isUserEmoji(emoji)) { + this.record.emojiCount[emoji] = 0; + } + // Create an Emoji claim and send to the server + const emojiClaim: GenericVerifiableCredential = { + "@type": "Emoji", + text: emoji, + parentItem: { lastClaimId: this.record.jwtId }, + }; + const claim = await createAndSubmitClaim( + emojiClaim, + this.record.issuerDid, + this.apiServer, + this.axios, + ); + if ( + claim.success && + !(claim.success as { embeddedRecordError?: string }).embeddedRecordError + ) { + this.record.emojiCount[emoji] = + (this.record.emojiCount[emoji] || 0) + 1; + this.userEmojis = [...(this.userEmojis || []), emoji]; + } else { + this.notify.error("Failed to add emoji.", TIMEOUTS.STANDARD); + } + } catch (error) { + logger.error("Error submitting emoji:", error); + this.notify.error("Got error adding emoji.", TIMEOUTS.STANDARD); + } + } + + async removeEmoji(emoji: string) { + try { + // Create an Emoji claim and send to the server + const emojiClaim: GenericVerifiableCredential = { + "@type": "Emoji", + text: emoji, + parentItem: { lastClaimId: this.record.jwtId }, + }; + const claim = await createAndSubmitClaim( + emojiClaim, + this.record.issuerDid, + this.apiServer, + this.axios, + ); + if (claim.success) { + this.record.emojiCount[emoji] = + (this.record.emojiCount[emoji] || 0) - 1; + + // Update local emoji count for immediate UI feedback + const newCount = Math.max(0, this.record.emojiCount[emoji]); + if (newCount === 0) { + delete this.record.emojiCount[emoji]; + } else { + this.record.emojiCount[emoji] = newCount; + } + this.userEmojis = this.userEmojis?.filter(e => e !== emoji) || []; + } else { + this.notify.error("Failed to remove emoji.", TIMEOUTS.STANDARD); + } + } catch (error) { + logger.error("Error removing emoji:", error); + this.notify.error("Got error removing emoji.", TIMEOUTS.STANDARD); + } + } } diff --git a/src/interfaces/common.ts b/src/interfaces/common.ts index b2e68d1f..0dfe37d5 100644 --- a/src/interfaces/common.ts +++ b/src/interfaces/common.ts @@ -80,7 +80,7 @@ export interface UserInfo { } export interface CreateAndSubmitClaimResult { - success: boolean; + success: boolean | { embeddedRecordError?: string; claimId?: string }; error?: string; handleId?: string; } diff --git a/src/interfaces/records.ts b/src/interfaces/records.ts index ca82624c..24089b35 100644 --- a/src/interfaces/records.ts +++ b/src/interfaces/records.ts @@ -9,6 +9,7 @@ export interface GiveSummaryRecord { amount: number; amountConfirmed: number; description: string; + emojiCount: Record; // Map of emoji character to count fullClaim: GiveActionClaim; fulfillsHandleId: string; fulfillsPlanHandleId?: string; diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index 3e73cda4..75c9bb67 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -245,6 +245,7 @@ Raymer * @version 1.0.0 */ :last-viewed-claim-id="feedLastViewedClaimId" :is-registered="isRegistered" :active-did="activeDid" + :api-server="apiServer" @load-claim="onClickLoadClaim" @view-image="openImageViewer" /> @@ -1234,6 +1235,7 @@ export default class HomeView extends Vue { const recipientDid = this.extractRecipientDid(claim); const fulfillsPlan = await this.getFulfillsPlan(record); + const emojiCount = await record.emojiCount; // Log record details for debugging logger.debug("[HomeView] 🔍 Processing record:", { @@ -1264,6 +1266,7 @@ export default class HomeView extends Vue { provider, fulfillsPlan, providedByPlan, + emojiCount, ); } @@ -1487,12 +1490,14 @@ export default class HomeView extends Vue { provider: Provider | undefined, fulfillsPlan?: FulfillsPlan, providedByPlan?: ProvidedByPlan, + emojiCount?: Record, ): GiveRecordWithContactInfo { return { ...record, jwtId: record.jwtId, fullClaim: record.fullClaim, description: record.description || "", + emojiCount: emojiCount || {}, handleId: record.handleId, issuerDid: record.issuerDid, fulfillsPlanHandleId: record.fulfillsPlanHandleId, -- 2.30.2 From a4a9293bc2d6915aec82c64ab5f3032afc9400fd Mon Sep 17 00:00:00 2001 From: Trent Larson Date: Sun, 19 Oct 2025 15:22:34 -0600 Subject: [PATCH 2/7] feat: get the emojis to work with additions, removals, and multiple people --- src/components/ActivityListItem.vue | 202 +++++++++++++------ src/db-sql/migration.ts | 34 +--- src/interfaces/common.ts | 4 +- src/interfaces/index.ts | 31 --- src/interfaces/records.ts | 13 +- src/libs/endorserServer.ts | 13 +- src/libs/util.ts | 26 +++ src/services/platforms/WebPlatformService.ts | 8 +- src/views/HomeView.vue | 3 +- 9 files changed, 199 insertions(+), 135 deletions(-) diff --git a/src/components/ActivityListItem.vue b/src/components/ActivityListItem.vue index 063a4c51..04a1cd6b 100644 --- a/src/components/ActivityListItem.vue +++ b/src/components/ActivityListItem.vue @@ -79,24 +79,34 @@
-
+
@@ -121,14 +132,20 @@ class="mt-1 p-1.5 bg-slate-50 rounded border border-slate-300" > -
+
@@ -323,8 +340,9 @@ import { NOTIFY_PERSON_HIDDEN, NOTIFY_UNKNOWN_PERSON, } from "@/constants/notifications"; -import { GenericVerifiableCredential } from "@/interfaces"; +import { EmojiSummaryRecord, GenericVerifiableCredential } from "@/interfaces"; import { GiveRecordWithContactInfo } from "@/interfaces/give"; +import { PromiseTracker } from "@/libs/util"; @Component({ components: { @@ -348,8 +366,9 @@ export default class ActivityListItem extends Vue { // Emoji-related data showEmojiPicker = false; + loadingEmojis = false; // Track if emojis are currently loading - userEmojis: string[] | null = null; // load this only when needed + emojisOnActivity: PromiseTracker | null = null; // load this only when needed created() { this.notify = createNotifyHelpers(this.$notify); @@ -420,52 +439,87 @@ export default class ActivityListItem extends Vue { return Object.keys(this.record.emojiCount).length > 0; } - async loadUserEmojis(): Promise { - try { - const response = await this.axios.get( - `${this.apiServer}/api/v2/emoji/userEmojis?parentHandleId=${this.record.jwtId}`, - { headers: await getHeaders(this.activeDid) }, - ); - this.userEmojis = response.data; - } catch (error) { - logger.error( - "Error loading all emojis for parent handle id:", - this.record.jwtId, - error, - ); + triggerUserEmojiLoad(): PromiseTracker { + if (!this.emojisOnActivity) { + const promise = new Promise((resolve) => { + (async () => { + this.axios + .get( + `${this.apiServer}/api/v2/report/emoji?parentHandleId=${encodeURIComponent(this.record.handleId)}`, + { headers: await getHeaders(this.activeDid) }, + ) + .then((response) => { + const userEmojiRecords = response.data.data.filter( + (e: EmojiSummaryRecord) => e.issuerDid === this.activeDid, + ); + resolve(userEmojiRecords); + }) + .catch((error) => { + logger.error("Error loading user emojis:", error); + resolve([]); + }); + })(); + }); + + this.emojisOnActivity = new PromiseTracker(promise); } + return this.emojisOnActivity; } - async getUserEmojis(): Promise { - if (!this.userEmojis) { - await this.loadUserEmojis(); + /** + * + * @param emoji - The emoji to check. + * @returns True if the emoji is in the user's emojis, false otherwise. + * + * @note This method is quick and synchronous, and can check resolved emojis + * without triggering a server request. Returns false if emojis haven't been loaded yet. + */ + isUserEmojiWithoutLoading(emoji: string): boolean { + if (this.emojisOnActivity?.isResolved && this.emojisOnActivity.value) { + return this.emojisOnActivity.value.some( + (record) => record.text === emoji, + ); } - return this.userEmojis || []; + return false; } - selectEmoji(emoji: string) { - this.showEmojiPicker = false; - this.submitEmoji(emoji); + async toggleEmojiPicker() { + this.triggerUserEmojiLoad(); // trigger it, but don't wait for it to complete + this.showEmojiPicker = !this.showEmojiPicker; } - isUserEmoji(emoji: string): boolean { - return this.userEmojis?.includes(emoji) || false; - } + async toggleThisEmoji(emoji: string) { + // Start loading indicator + this.loadingEmojis = true; + this.showEmojiPicker = false; // always close the picker when an emoji is clicked + + try { + this.triggerUserEmojiLoad(); // trigger just in case - toggleEmoji(emoji: string) { - if (this.isUserEmoji(emoji)) { - this.removeEmoji(emoji); - } else { - this.submitEmoji(emoji); + const userEmojiList = await this.emojisOnActivity!.promise; // must wait now that they've chosen + + const userHasEmoji: boolean = userEmojiList.some( + (record) => record.text === emoji, + ); + + if (userHasEmoji) { + // User already has this emoji, ask for confirmation to remove + const confirmed = confirm(`Do you want to remove your ${emoji} emoji?`); + if (confirmed) { + await this.removeEmoji(emoji); + } + } else { + // User doesn't have this emoji, add it + await this.submitEmoji(emoji); + } + } finally { + // Remove loading indicator + this.loadingEmojis = false; } } async submitEmoji(emoji: string) { try { - // Temporarily add to user emojis for UI feedback - if (!this.isUserEmoji(emoji)) { - this.record.emojiCount[emoji] = 0; - } // Create an Emoji claim and send to the server const emojiClaim: GenericVerifiableCredential = { "@type": "Emoji", @@ -474,17 +528,30 @@ export default class ActivityListItem extends Vue { }; const claim = await createAndSubmitClaim( emojiClaim, - this.record.issuerDid, + this.activeDid, this.apiServer, this.axios, ); - if ( - claim.success && - !(claim.success as { embeddedRecordError?: string }).embeddedRecordError - ) { + if (claim.success && !claim.embeddedRecordError) { + // Update emoji count this.record.emojiCount[emoji] = (this.record.emojiCount[emoji] || 0) + 1; - this.userEmojis = [...(this.userEmojis || []), emoji]; + + // Create a new emoji record (we'll get the actual jwtId from the server response later) + const newEmojiRecord: EmojiSummaryRecord = { + issuerDid: this.activeDid, + jwtId: claim.claimId || "", + text: emoji, + parentHandleId: this.record.jwtId, + }; + + // Update user emojis list by creating a new promise with the updated data + // (Trigger shouldn't be necessary since all calls should come through a toggle, but just in case someone calls this directly) + this.triggerUserEmojiLoad(); + const currentEmojis = await this.emojisOnActivity!.promise; // must wait now that they've clicked one + this.emojisOnActivity = new PromiseTracker( + Promise.resolve([...currentEmojis, newEmojiRecord]), + ); } else { this.notify.error("Failed to add emoji.", TIMEOUTS.STANDARD); } @@ -504,22 +571,31 @@ export default class ActivityListItem extends Vue { }; const claim = await createAndSubmitClaim( emojiClaim, - this.record.issuerDid, + this.activeDid, this.apiServer, this.axios, ); - if (claim.success) { - this.record.emojiCount[emoji] = - (this.record.emojiCount[emoji] || 0) - 1; - - // Update local emoji count for immediate UI feedback - const newCount = Math.max(0, this.record.emojiCount[emoji]); + if (claim.success && !claim.embeddedRecordError) { + // Update emoji count + const newCount = Math.max(0, (this.record.emojiCount[emoji] || 0) - 1); if (newCount === 0) { delete this.record.emojiCount[emoji]; } else { this.record.emojiCount[emoji] = newCount; } - this.userEmojis = this.userEmojis?.filter(e => e !== emoji) || []; + + // Update user emojis list by creating a new promise with the updated data + // (Trigger shouldn't be necessary since all calls should come through a toggle, but just in case someone calls this directly) + this.triggerUserEmojiLoad(); + const currentEmojis = await this.emojisOnActivity!.promise; // must wait now that they've clicked one + this.emojisOnActivity = new PromiseTracker( + Promise.resolve( + currentEmojis.filter( + (record) => + record.issuerDid === this.activeDid && record.text !== emoji, + ), + ), + ); } else { this.notify.error("Failed to remove emoji.", TIMEOUTS.STANDARD); } diff --git a/src/db-sql/migration.ts b/src/db-sql/migration.ts index ca5dad14..4a177786 100644 --- a/src/db-sql/migration.ts +++ b/src/db-sql/migration.ts @@ -234,32 +234,20 @@ export async function runMigrations( sqlQuery: (sql: string, params?: unknown[]) => Promise, extractMigrationNames: (result: T) => Set, ): Promise { - // Only log migration start in development - const isDevelopment = process.env.VITE_PLATFORM === "development"; - if (isDevelopment) { - logger.debug("[Migration] Starting database migrations"); - } + logger.debug("[Migration] Starting database migrations"); for (const migration of MIGRATIONS) { - if (isDevelopment) { - logger.debug("[Migration] Registering migration:", migration.name); - } + logger.debug("[Migration] Registering migration:", migration.name); registerMigration(migration); } - if (isDevelopment) { - logger.debug("[Migration] Running migration service"); - } + logger.debug("[Migration] Running migration service"); await runMigrationsService(sqlExec, sqlQuery, extractMigrationNames); - if (isDevelopment) { - logger.debug("[Migration] Database migrations completed"); - } + logger.debug("[Migration] Database migrations completed"); // Bootstrapping: Ensure active account is selected after migrations - if (isDevelopment) { - logger.debug("[Migration] Running bootstrapping hooks"); - } + logger.debug("[Migration] Running bootstrapping hooks"); try { // Check if we have accounts but no active selection const accountsResult = await sqlQuery("SELECT COUNT(*) FROM accounts"); @@ -274,18 +262,14 @@ export async function runMigrations( activeDid = (extractSingleValue(activeResult) as string) || null; } catch (error) { // Table doesn't exist - migration 004 may not have run yet - if (isDevelopment) { - logger.debug( - "[Migration] active_identity table not found - migration may not have run", - ); - } + logger.debug( + "[Migration] active_identity table not found - migration may not have run", + ); activeDid = null; } if (accountsCount > 0 && (!activeDid || activeDid === "")) { - if (isDevelopment) { - logger.debug("[Migration] Auto-selecting first account as active"); - } + logger.debug("[Migration] Auto-selecting first account as active"); const firstAccountResult = await sqlQuery( "SELECT did FROM accounts ORDER BY dateCreated, did LIMIT 1", ); diff --git a/src/interfaces/common.ts b/src/interfaces/common.ts index 0dfe37d5..f1f172e2 100644 --- a/src/interfaces/common.ts +++ b/src/interfaces/common.ts @@ -80,8 +80,10 @@ export interface UserInfo { } export interface CreateAndSubmitClaimResult { - success: boolean | { embeddedRecordError?: string; claimId?: string }; + success: boolean; + embeddedRecordError?: string; error?: string; + claimId?: string; handleId?: string; } diff --git a/src/interfaces/index.ts b/src/interfaces/index.ts index fbbe1c50..9cea2165 100644 --- a/src/interfaces/index.ts +++ b/src/interfaces/index.ts @@ -1,34 +1,3 @@ -export type { - // From common.ts - CreateAndSubmitClaimResult, - GenericCredWrapper, - GenericVerifiableCredential, - KeyMeta, - // Exclude types that are also exported from other files - // GiveVerifiableCredential, - // OfferVerifiableCredential, - // RegisterVerifiableCredential, - // PlanSummaryRecord, - // UserInfo, -} from "./common"; - -export type { - // From claims.ts - GiveActionClaim, - OfferClaim, - RegisterActionClaim, -} from "./claims"; - -export type { - // From records.ts - PlanSummaryRecord, -} from "./records"; - -export type { - // From user.ts - UserInfo, -} from "./user"; - export * from "./limits"; export * from "./deepLinks"; export * from "./common"; diff --git a/src/interfaces/records.ts b/src/interfaces/records.ts index 24089b35..03627904 100644 --- a/src/interfaces/records.ts +++ b/src/interfaces/records.ts @@ -1,9 +1,20 @@ import { GiveActionClaim, OfferClaim, PlanActionClaim } from "./claims"; import { GenericCredWrapper } from "./common"; +export interface EmojiSummaryRecord { + issuerDid: string; + jwtId: string; + text: string; + parentHandleId: string; +} + // a summary record; the VC is found the fullClaim field export interface GiveSummaryRecord { - [x: string]: PropertyKey | undefined | GiveActionClaim; + [x: string]: + | PropertyKey + | undefined + | GiveActionClaim + | Record; type?: string; agentDid: string; amount: number; diff --git a/src/libs/endorserServer.ts b/src/libs/endorserServer.ts index a0e2bf6c..08a65934 100644 --- a/src/libs/endorserServer.ts +++ b/src/libs/endorserServer.ts @@ -630,11 +630,7 @@ async function performPlanRequest( return cred; } else { - // Use debug level for development to reduce console noise - const isDevelopment = process.env.VITE_PLATFORM === "development"; - const log = isDevelopment ? logger.debug : logger.log; - - log( + logger.debug( "[Plan Loading] ⚠️ Plan cache is empty for handle", handleId, " Got data:", @@ -1226,7 +1222,12 @@ export async function createAndSubmitClaim( timestamp: new Date().toISOString(), }); - return { success: true, handleId: response.data?.handleId }; + return { + success: true, + claimId: response.data?.claimId, + handleId: response.data?.handleId, + embeddedRecordError: response.data?.embeddedRecordError, + }; } catch (error: unknown) { // Enhanced error logging with comprehensive context const requestId = `claim_error_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`; diff --git a/src/libs/util.ts b/src/libs/util.ts index 40d0fd3a..72dbf164 100644 --- a/src/libs/util.ts +++ b/src/libs/util.ts @@ -1147,3 +1147,29 @@ export async function checkForDuplicateAccount( return (existingAccount?.values?.length ?? 0) > 0; } + +export class PromiseTracker { + private _promise: Promise; + private _resolved = false; + private _value: T | undefined; + + constructor(promise: Promise) { + this._promise = promise.then((value) => { + this._resolved = true; + this._value = value; + return value; + }); + } + + get isResolved(): boolean { + return this._resolved; + } + + get value(): T | undefined { + return this._value; + } + + get promise(): Promise { + return this._promise; + } +} diff --git a/src/services/platforms/WebPlatformService.ts b/src/services/platforms/WebPlatformService.ts index 3d8248f5..ac1a3562 100644 --- a/src/services/platforms/WebPlatformService.ts +++ b/src/services/platforms/WebPlatformService.ts @@ -48,15 +48,11 @@ export class WebPlatformService implements PlatformService { constructor() { WebPlatformService.instanceCount++; - // Use debug level logging for development mode to reduce console noise - const isDevelopment = process.env.VITE_PLATFORM === "development"; - const log = isDevelopment ? logger.debug : logger.log; - - log("[WebPlatformService] Initializing web platform service"); + logger.debug("[WebPlatformService] Initializing web platform service"); // Only initialize SharedArrayBuffer setup for web platforms if (this.isWorker()) { - log("[WebPlatformService] Skipping initBackend call in worker context"); + logger.debug("[WebPlatformService] Skipping initBackend call in worker context"); return; } diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue index 75c9bb67..9f087d85 100644 --- a/src/views/HomeView.vue +++ b/src/views/HomeView.vue @@ -1235,7 +1235,6 @@ export default class HomeView extends Vue { const recipientDid = this.extractRecipientDid(claim); const fulfillsPlan = await this.getFulfillsPlan(record); - const emojiCount = await record.emojiCount; // Log record details for debugging logger.debug("[HomeView] 🔍 Processing record:", { @@ -1266,7 +1265,7 @@ export default class HomeView extends Vue { provider, fulfillsPlan, providedByPlan, - emojiCount, + record.emojiCount, ); } -- 2.30.2 From 499fbd2cb3265baea6e448cfe8143175639ce7f0 Mon Sep 17 00:00:00 2001 From: Trent Larson Date: Sun, 19 Oct 2025 16:41:53 -0600 Subject: [PATCH 3/7] feat: show a better emoji-confirmation message, hide all emoji stuff from unregistered on items without emojis --- src/components/ActivityListItem.vue | 20 +++++++++++++++----- src/services/platforms/WebPlatformService.ts | 4 +++- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/components/ActivityListItem.vue b/src/components/ActivityListItem.vue index 04a1cd6b..93caeba8 100644 --- a/src/components/ActivityListItem.vue +++ b/src/components/ActivityListItem.vue @@ -79,6 +79,7 @@
@@ -503,11 +504,20 @@ export default class ActivityListItem extends Vue { ); if (userHasEmoji) { - // User already has this emoji, ask for confirmation to remove - const confirmed = confirm(`Do you want to remove your ${emoji} emoji?`); - if (confirmed) { - await this.removeEmoji(emoji); - } + + this.$notify( + { + group: "modal", + type: "confirm", + title: "Remove Emoji", + text: `Do you want to remove your ${emoji} ?`, + yesText: "Remove", + onYes: async () => { + await this.removeEmoji(emoji); + }, + }, + TIMEOUTS.MODAL, + ); } else { // User doesn't have this emoji, add it await this.submitEmoji(emoji); diff --git a/src/services/platforms/WebPlatformService.ts b/src/services/platforms/WebPlatformService.ts index ac1a3562..b5b25622 100644 --- a/src/services/platforms/WebPlatformService.ts +++ b/src/services/platforms/WebPlatformService.ts @@ -52,7 +52,9 @@ export class WebPlatformService implements PlatformService { // Only initialize SharedArrayBuffer setup for web platforms if (this.isWorker()) { - logger.debug("[WebPlatformService] Skipping initBackend call in worker context"); + logger.debug( + "[WebPlatformService] Skipping initBackend call in worker context", + ); return; } -- 2.30.2 From 86caf793aa47311c6e30f5bbd333c4ee93a0502a Mon Sep 17 00:00:00 2001 From: Trent Larson Date: Sun, 19 Oct 2025 18:43:21 -0600 Subject: [PATCH 4/7] feat: make spinner more standard, show emoji on claim-view page --- src/components/ActivityListItem.vue | 5 +++-- src/interfaces/claims.ts | 7 +++++++ src/interfaces/index.ts | 7 ++++--- src/views/ClaimView.vue | 12 ++++++++---- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/components/ActivityListItem.vue b/src/components/ActivityListItem.vue index 93caeba8..2c59d569 100644 --- a/src/components/ActivityListItem.vue +++ b/src/components/ActivityListItem.vue @@ -106,7 +106,9 @@ @click="toggleThisEmoji(emoji)" > -
⟳
+
+ +
{{ emoji }} {{ count @@ -504,7 +506,6 @@ export default class ActivityListItem extends Vue { ); if (userHasEmoji) { - this.$notify( { group: "modal", diff --git a/src/interfaces/claims.ts b/src/interfaces/claims.ts index 1fc03529..49e2b4a8 100644 --- a/src/interfaces/claims.ts +++ b/src/interfaces/claims.ts @@ -14,6 +14,13 @@ export interface AgreeActionClaim extends ClaimObject { object: Record; } +export interface EmojiClaim extends ClaimObject { + // default context is "https://endorser.ch" + "@type": "Emoji"; + text: string; + parentItem: { lastClaimId: string }; +} + // Note that previous VCs may have additional fields. // https://endorser.ch/doc/html/transactions.html#id4 export interface GiveActionClaim extends ClaimObject { diff --git a/src/interfaces/index.ts b/src/interfaces/index.ts index 9cea2165..c4b12191 100644 --- a/src/interfaces/index.ts +++ b/src/interfaces/index.ts @@ -1,5 +1,6 @@ -export * from "./limits"; -export * from "./deepLinks"; -export * from "./common"; +export * from "./claims"; export * from "./claims-result"; +export * from "./common"; +export * from "./deepLinks"; +export * from "./limits"; export * from "./records"; diff --git a/src/views/ClaimView.vue b/src/views/ClaimView.vue index 3d09ac42..d32a10ff 100644 --- a/src/views/ClaimView.vue +++ b/src/views/ClaimView.vue @@ -91,12 +91,12 @@
- +
@@ -551,7 +551,7 @@ import VueMarkdown from "vue-markdown-render"; import { Router, RouteLocationNormalizedLoaded } from "vue-router"; import { copyToClipboard } from "../services/ClipboardService"; -import { GenericVerifiableCredential } from "../interfaces"; +import { EmojiClaim, GenericVerifiableCredential } from "../interfaces"; import GiftedDialog from "../components/GiftedDialog.vue"; import QuickNav from "../components/QuickNav.vue"; import { NotificationIface } from "../constants/app"; @@ -667,6 +667,10 @@ export default class ClaimView extends Vue { return giveClaim.description || ""; } + if (this.veriClaim.claimType === "Emoji") { + return (claim as EmojiClaim).text || ""; + } + // Fallback for other claim types return (claim as { description?: string })?.description || ""; } -- 2.30.2 From c369c76c1a2d8416c4724f403ae3e2417f8c9fc0 Mon Sep 17 00:00:00 2001 From: Trent Larson Date: Sun, 19 Oct 2025 18:44:14 -0600 Subject: [PATCH 5/7] fix: linting --- src/views/ClaimView.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/ClaimView.vue b/src/views/ClaimView.vue index d32a10ff..9671e801 100644 --- a/src/views/ClaimView.vue +++ b/src/views/ClaimView.vue @@ -93,7 +93,10 @@ data-testId="description" class="flex items-start gap-2 overflow-hidden" > - + Date: Sun, 19 Oct 2025 18:53:20 -0600 Subject: [PATCH 6/7] feat: add context for Emoji claims --- src/components/ActivityListItem.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/ActivityListItem.vue b/src/components/ActivityListItem.vue index 2c59d569..ebc081d8 100644 --- a/src/components/ActivityListItem.vue +++ b/src/components/ActivityListItem.vue @@ -533,6 +533,7 @@ export default class ActivityListItem extends Vue { try { // Create an Emoji claim and send to the server const emojiClaim: GenericVerifiableCredential = { + "@context": "https://endorser.ch", "@type": "Emoji", text: emoji, parentItem: { lastClaimId: this.record.jwtId }, @@ -576,6 +577,7 @@ export default class ActivityListItem extends Vue { try { // Create an Emoji claim and send to the server const emojiClaim: GenericVerifiableCredential = { + "@context": "https://endorser.ch", "@type": "Emoji", text: emoji, parentItem: { lastClaimId: this.record.jwtId }, -- 2.30.2 From 637fc10e64402a07b6f5b25db89ab8c3bd0072d2 Mon Sep 17 00:00:00 2001 From: Trent Larson Date: Sun, 19 Oct 2025 18:57:13 -0600 Subject: [PATCH 7/7] chore: remove emoji-mart-vue-fast that isn't used yet --- package-lock.json | 24 +----------------------- package.json | 1 - 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 432cb310..914004eb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -61,7 +61,6 @@ "did-resolver": "^4.1.0", "dotenv": "^16.0.3", "electron-builder": "^26.0.12", - "emoji-mart-vue-fast": "^15.0.5", "ethereum-cryptography": "^2.1.3", "ethereumjs-util": "^7.1.5", "jdenticon": "^3.2.0", @@ -1865,6 +1864,7 @@ "version": "7.28.3", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.3.tgz", "integrity": "sha512-9uIQ10o0WGdpP6GDhXcdOJPJuDgFtIDtN/9+ArJQ2NAfAmiuhTQdzkaTGR33v43GYS2UrSA0eX2pPPHoFVvpxA==", + "devOptional": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -14990,16 +14990,6 @@ "devOptional": true, "license": "MIT" }, - "node_modules/core-js": { - "version": "3.46.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.46.0.tgz", - "integrity": "sha512-vDMm9B0xnqqZ8uSBpZ8sNtRtOdmfShrvT6h2TuQGLs0Is+cR0DYbj/KWP6ALVNbWPpqA/qPLoOuppJN07humpA==", - "hasInstallScript": true, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/core-js" - } - }, "node_modules/core-js-compat": { "version": "3.45.0", "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.45.0.tgz", @@ -16432,18 +16422,6 @@ "url": "https://github.com/sindresorhus/emittery?sponsor=1" } }, - "node_modules/emoji-mart-vue-fast": { - "version": "15.0.5", - "resolved": "https://registry.npmjs.org/emoji-mart-vue-fast/-/emoji-mart-vue-fast-15.0.5.tgz", - "integrity": "sha512-wnxLor8ggpqshoOPwIc33MdOC3A1XFeDLgUwYLPtNPL8VeAtXJAVrnFq1CN5PeCYAFoLo4IufHQZ9CfHD4IZiw==", - "dependencies": { - "@babel/runtime": "^7.18.6", - "core-js": "^3.23.5" - }, - "peerDependencies": { - "vue": ">2.0.0" - } - }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", diff --git a/package.json b/package.json index 1d5ab589..a9587886 100644 --- a/package.json +++ b/package.json @@ -190,7 +190,6 @@ "did-resolver": "^4.1.0", "dotenv": "^16.0.3", "electron-builder": "^26.0.12", - "emoji-mart-vue-fast": "^15.0.5", "ethereum-cryptography": "^2.1.3", "ethereumjs-util": "^7.1.5", "jdenticon": "^3.2.0", -- 2.30.2