From 59b2041171a2ef59fb1ee48de365bf57a1a63bb7 Mon Sep 17 00:00:00 2001 From: phoebus-84 Date: Thu, 10 Oct 2024 18:50:59 +0200 Subject: [PATCH 1/3] fix: verifier logo in activities card --- src/lib/preferences/activity.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/preferences/activity.ts b/src/lib/preferences/activity.ts index 56b80a9a..b9cc090e 100644 --- a/src/lib/preferences/activity.ts +++ b/src/lib/preferences/activity.ts @@ -127,6 +127,7 @@ export async function getParsedActivities(): Promise { } } else if (activity.type === 'verification') { const { verifier_name, success, rp_name, properties } = activity; + parsedActivity.name = verifier_name; parsedActivity.message = `${verifier_name} verified yours: ${properties.join(', ')} via ${rp_name} and it was a ${ success ? 'success' : 'failure' }`; From a75e5b35e61ae6c859f5f1fca6b0f8578da46317 Mon Sep 17 00:00:00 2001 From: phoebus-84 Date: Wed, 16 Oct 2024 17:58:28 +0200 Subject: [PATCH 2/3] fix: add verifier logo in activities --- src/lib/components/organisms/scanner/tools.ts | 5 +++++ src/lib/mobile_zencode | 2 +- src/lib/preferences/activity.ts | 14 ++++++++++++-- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/lib/components/organisms/scanner/tools.ts b/src/lib/components/organisms/scanner/tools.ts index 1c5e8f14..58e66d1e 100644 --- a/src/lib/components/organisms/scanner/tools.ts +++ b/src/lib/components/organisms/scanner/tools.ts @@ -27,6 +27,11 @@ export type Info = { asked_claims: AskedClaims; rp_name: string; verifier_name: string; + avatar:{ + collection:string; + fileName:string; + id:string; + } }; export type AskedClaims = { diff --git a/src/lib/mobile_zencode b/src/lib/mobile_zencode index f0dc301d..18f11207 160000 --- a/src/lib/mobile_zencode +++ b/src/lib/mobile_zencode @@ -1 +1 @@ -Subproject commit f0dc301d8d9b81e924da0745c6f7f850d9bd9d26 +Subproject commit 18f1120777d90db943c5e15dc066b9a5c76af1a9 diff --git a/src/lib/preferences/activity.ts b/src/lib/preferences/activity.ts index 6da26bb9..f0dea929 100644 --- a/src/lib/preferences/activity.ts +++ b/src/lib/preferences/activity.ts @@ -8,6 +8,7 @@ import { setNewActivitiesInHome } from '$lib/homeFeedbackPreferences'; import { invalidate } from '$app/navigation'; import { _protectedLayoutKey } from '../../routes/[[lang]]/(protected)/+layout'; import type { Info } from '$lib/components/organisms/scanner/tools'; +import { filesUri } from '$lib/backendUri'; dayjs.extend(relativeTime); @@ -23,6 +24,7 @@ export type Verification = { rp_name: string; sid: string; properties: string[]; + avatar: { id: string; collection: string; fileName: string }; }; export type ExpiredCredential = { @@ -74,12 +76,13 @@ export async function addActivity(activity: Activity) { export async function addVerificationActivity(sid: string, info: Info, success: boolean) { const at = dayjs().unix(); - const { asked_claims } = info; + const { asked_claims, avatar } = info; const { properties } = asked_claims; const propertiesArray = Object.values(properties).map((property) => property.title); await addActivity({ type: 'verification', verifier_name: info.verifier_name, + avatar, success, rp_name: info.rp_name, sid, @@ -128,8 +131,15 @@ export async function getParsedActivities(): Promise { parsedActivity.message = `${credential.display_name} is expired`; } } else if (activity.type === 'verification') { - const { verifier_name, success, rp_name, properties } = activity; + const { verifier_name, success, rp_name, properties, avatar } = activity; parsedActivity.name = verifier_name; + + if (avatar) { + parsedActivity.logo = { + url: filesUri(avatar.fileName, avatar.collection, avatar.id), + alt_text: verifier_name + }; + } parsedActivity.message = `${verifier_name} verified yours: ${properties.join(', ')} via ${rp_name} and it was a ${ success ? 'success' : 'failure' }`; From d4219f8b24bfcbd3892036d6b03361e63015692a Mon Sep 17 00:00:00 2001 From: phoebus-84 Date: Wed, 16 Oct 2024 18:33:57 +0200 Subject: [PATCH 3/3] fix: update node version during ci pnpm setup --- .github/workflows/alpha_version.yml | 2 ++ .github/workflows/firebase_version.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/alpha_version.yml b/.github/workflows/alpha_version.yml index 490a3e53..77747678 100644 --- a/.github/workflows/alpha_version.yml +++ b/.github/workflows/alpha_version.yml @@ -11,6 +11,7 @@ jobs: - uses: actions/checkout@v4 - uses: dyne/pnpm@main with: + node-version: '20.11.1' submodules: true - uses: actions/setup-go@v5 with: @@ -46,6 +47,7 @@ jobs: - uses: dyne/pnpm@main with: submodules: true + node-version: '20.11.1' - uses: actions/cache@v4 with: path: | diff --git a/.github/workflows/firebase_version.yml b/.github/workflows/firebase_version.yml index f20be2d1..0f87310c 100644 --- a/.github/workflows/firebase_version.yml +++ b/.github/workflows/firebase_version.yml @@ -12,6 +12,7 @@ jobs: - uses: actions/checkout@v4 - uses: dyne/pnpm@main with: + node-version: '20.11.1' submodules: true - uses: actions/setup-go@v5 with: @@ -46,6 +47,7 @@ jobs: steps: - uses: dyne/pnpm@main with: + node-version: '20.11.1' submodules: true - uses: actions/cache@v4 with: