From 3eb913149449db8af60b63f5b153370276bc97a7 Mon Sep 17 00:00:00 2001
From: Andy Parsons <andyp@adobe.com>
Date: Thu, 30 Apr 2026 13:28:44 -0400
Subject: [PATCH 1/2] =?UTF-8?q?chore:=20fix=20all=20ESLint=20errors=20(103?=
 =?UTF-8?q?=20=E2=86=92=200)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Remove unused imports and variables across 17 files
- Replace `any` types with specific inline types for C2PA assertion
  accesses, validation status objects, and trust-annotated manifest types
- Fix unused export prop in AssetInfoIssuerDate (let → const)
- Fix svelte-ignore → eslint-disable-next-line for {@html} in IssuedBySection
- Auto-fixed padding, prefer-const, and shorthand attribute violations

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../EmbeddedIcon/EmbeddedIcon.svelte          |  2 +-
 src/lib/asset.ts                              | 23 ++++--
 src/lib/crjson.ts                             | 30 +++++--
 src/lib/sdk.ts                                |  2 +
 src/lib/selectors/doNotTrain.ts               | 14 +++-
 src/lib/selectors/editsAndActivity.ts         | 18 ++--
 src/lib/selectors/generativeInfo.ts           | 30 +++++--
 src/lib/selectors/producer.ts                 | 12 ++-
 src/lib/selectors/reviewRatings.ts            |  3 +-
 src/lib/selectors/socialAccounts.ts           |  5 +-
 src/lib/selectors/web3Info.ts                 |  4 +-
 src/lib/selectors/website.ts                  |  7 +-
 .../AssetInfo/AssetInfoIssuerDate.svelte      |  4 +-
 .../AboutSection/AboutSection.svelte          |  5 +-
 .../AboutSection/IssuedBySection.svelte       |  2 +
 .../verify/components/TreeView/TreeL1.svelte  |  1 -
 src/routes/verify/stores/c2paReader.ts        | 82 ++++++++-----------
 17 files changed, 147 insertions(+), 97 deletions(-)

diff --git a/src/components/EmbeddedIcon/EmbeddedIcon.svelte b/src/components/EmbeddedIcon/EmbeddedIcon.svelte
index cf93a929e..2c89a618b 100644
--- a/src/components/EmbeddedIcon/EmbeddedIcon.svelte
+++ b/src/components/EmbeddedIcon/EmbeddedIcon.svelte
@@ -3,7 +3,7 @@
 -->
 <script lang="ts">
   import type { ClaimGeneratorDisplayInfo } from '$src/lib/asset';
-  import { loadThumbnail } from '$src/lib/thumbnail';
+
   interface DisposableBlobUrl {
     url: string;
     dispose: () => void;
diff --git a/src/lib/asset.ts b/src/lib/asset.ts
index 0d3ce7334..512ef8135 100644
--- a/src/lib/asset.ts
+++ b/src/lib/asset.ts
@@ -260,7 +260,7 @@ export async function resultToAssetMap({
       manifestData: await getManifestData(manifest, rootValidationResult),
       dataType: null,
       validationResult: rootValidationResult,
-      trustSource: (manifest as any).trust_source || 'none',
+      trustSource: (manifest as Manifest & { trust_source?: string }).trust_source || 'none',
     };
 
     if (thumbnail?.dispose) {
@@ -318,7 +318,7 @@ export async function resultToAssetMap({
       manifestData: await getManifestData(ingredientManifest, validationResult),
       dataType: getIngredientDataType(ingredient),
       validationResult,
-      trustSource: (ingredient as any)?.trust_source || 'none',
+      trustSource: (ingredient as Ingredient & { trust_source?: string })?.trust_source || 'none',
     };
 
     if (thumbnail?.dispose) {
@@ -338,9 +338,12 @@ export async function resultToAssetMap({
       return null;
     }
 
-    function formattedGeneratorInfo(claim_generator: any) {
+    type ClaimGeneratorEntry = { name?: string; version?: string | null; icon?: Thumbnail | null };
+
+    function formattedGeneratorInfo(claim_generator: ClaimGeneratorEntry): ClaimGeneratorEntry {
       const version = claim_generator?.version;
       claim_generator.version = version?.replace(/\([^()]*\)/g, '');
+
       return claim_generator;
     }
 
@@ -359,8 +362,6 @@ export async function resultToAssetMap({
       icon: claimGeneratorInfo?.icon ?? null,
     };
 
-    // Extract Organization (O) from the native X.509 certificate subject tree
-    let organization: string | undefined = undefined;
     const safeSignatureInfo = manifest.signature_info
       ? { ...manifest.signature_info }
       : null;
@@ -383,9 +384,9 @@ export async function resultToAssetMap({
         );
 
         if (editsAndActivity) {
-          const actionsAssertion = manifest.assertions?.['c2pa.actions'];
+          const actionsAssertion = manifest.assertions?.['c2pa.actions'] as { data?: { metadata?: Record<string, unknown> } } | undefined;
           const hasInference =
-            !!(actionsAssertion as any)?.data?.metadata?.['com.adobe.inference'];
+            !!actionsAssertion?.data?.metadata?.['com.adobe.inference'];
 
           const filteredEditsAndActivity = editsAndActivity.filter(
             (value) => !!value.label,
@@ -415,15 +416,18 @@ export async function resultToAssetMap({
 
         // 2. Must have exactly one action in the manifest history
         let actionsAssertion;
+
         if (manifest.assertions instanceof Map) {
           actionsAssertion = manifest.assertions.get('c2pa.actions.v2')?.[0] || manifest.assertions.get('c2pa.actions')?.[0] || manifest.assertions.get('c2pa.actions.v2') || manifest.assertions.get('c2pa.actions');
         } else if (Array.isArray(manifest.assertions)) {
-          actionsAssertion = manifest.assertions.find((a: any) => a.label === 'c2pa.actions.v2' || a.label === 'c2pa.actions');
+          actionsAssertion = manifest.assertions.find((a: { label?: string }) => a.label === 'c2pa.actions.v2' || a.label === 'c2pa.actions');
         } else {
           actionsAssertion = manifest.assertions?.['c2pa.actions.v2'] || manifest.assertions?.['c2pa.actions'];
         }
 
-        const actions = (actionsAssertion as any)?.data?.actions || (actionsAssertion as any)?.actions || [];
+        type C2paActionItem = { action: string; digitalSourceType?: string; parameters?: { digitalSourceType?: string } };
+        type AssertionValue = { data?: { actions?: C2paActionItem[] }; actions?: C2paActionItem[] };
+        const actions = (actionsAssertion as AssertionValue)?.data?.actions || (actionsAssertion as AssertionValue)?.actions || [];
         if (actions.length !== 1) return false;
 
         // 3. First and only action must be c2pa.created
@@ -432,6 +436,7 @@ export async function resultToAssetMap({
 
         // 4. Digital source type must be a standard captured media URI (including computational)
         const sourceType = action.digitalSourceType || action.parameters?.digitalSourceType || '';
+
         return sourceType.includes('digitalCapture') || sourceType.includes('compositeCapture') || sourceType.includes('computationalCapture');
       })(),
     };
diff --git a/src/lib/crjson.ts b/src/lib/crjson.ts
index 6f1d2efa5..4eaaa8f29 100644
--- a/src/lib/crjson.ts
+++ b/src/lib/crjson.ts
@@ -1,8 +1,5 @@
-/**
- * crJSON (Content Credentials JSON) - native format from C2PA Reader.crjson().
- * This is the canonical format for reports: stored, downloaded, and passed through the app.
- * Legacy (Reader.json()) format is converted to crJSON only when received from the packaged SDK.
- */
+// Copyright 2021-2024 Adobe, Copyright 2026 The C2PA Contributors
+
 
 /** Validation status entry in crJSON (code, optional url, explanation) */
 export interface CrJsonValidationStatus {
@@ -83,12 +80,14 @@ export interface CrJsonClaimInfo {
 /** Detect if parsed JSON is crJSON format */
 export function isCrJson(obj: unknown): obj is CrJson {
   const o = obj as Record<string, unknown>
+
   return Array.isArray(o?.manifests) && o.manifests.length > 0 && o['@context'] != null
 }
 
 /** Read assertions as list from crJSON manifest.assertions (object → array of { label, data }) */
 export function getAssertionsList(m: CrJsonManifestEntry): CrJsonAssertionItem[] {
   const assertions = m.assertions ?? {}
+
   return Object.entries(assertions).map(([label, data]) => ({ label, data }))
 }
 
@@ -96,8 +95,10 @@ export function getAssertionsList(m: CrJsonManifestEntry): CrJsonAssertionItem[]
 export function getIngredientsFromManifest(m: CrJsonManifestEntry): CrJsonIngredientItem[] {
   const assertions = m.assertions ?? {}
   const out: CrJsonIngredientItem[] = []
+
   for (const [assertionLabel, data] of Object.entries(assertions)) {
     const d = data as Record<string, unknown>
+
     if (assertionLabel === 'c2pa.ingredient' || (d?.document_id != null && d?.instance_id != null)) {
       out.push({
         title: (d.title ?? d.dc_title ?? assertionLabel) as string,
@@ -109,6 +110,7 @@ export function getIngredientsFromManifest(m: CrJsonManifestEntry): CrJsonIngred
       })
     }
   }
+
   return out
 }
 
@@ -126,11 +128,14 @@ function certFieldToString(value: unknown): string {
   if (cn != null && typeof cn === 'string') return cn
   const parts: string[] = []
   const order = ['CN', 'O', 'OU', 'L', 'ST', 'C']
+
   for (const key of order) {
     const v = obj[key] ?? obj[key.toLowerCase()]
     if (v != null && typeof v === 'string') parts.push(`${key}=${v}`)
   }
+
   if (parts.length > 0) return parts.join(', ')
+
   return ''
 }
 
@@ -158,6 +163,7 @@ export function getSignatureInfo(m: CrJsonManifestEntry): CrJsonSignatureInfo |
   
   // Return undefined if no meaningful signature data (avoids empty section)
   if (!alg && !common_name && !issuer && !time) return undefined
+
   return { alg, common_name, organization, issuer, time }
 }
 
@@ -172,6 +178,7 @@ export function getClaimInfo(m: CrJsonManifestEntry): CrJsonClaimInfo {
       : claim?.claim_generator != null
         ? [{ name: String(claim.claim_generator) }]
         : []
+
   return {
     claim_generator: claim?.claim_generator as string | undefined,
     claim_generator_info: cgiArray as CrJsonClaimInfo['claim_generator_info'],
@@ -182,6 +189,7 @@ export function getClaimInfo(m: CrJsonManifestEntry): CrJsonClaimInfo {
 /** Get assertion data by label from crJSON manifest.assertions */
 export function getAssertionDataByLabel(m: CrJsonManifestEntry, label: string): unknown {
   const assertions = m.assertions ?? {}
+
   return assertions[label]
 }
 
@@ -192,11 +200,14 @@ export function getAssertionDataByLabel(m: CrJsonManifestEntry, label: string):
  */
 export function getActiveManifestValidationStatus(report: CrJson): CrJsonActiveManifestStatus | undefined {
   const docLevel = report.validationResults?.activeManifest
+
   if (docLevel && (docLevel.success?.length ?? 0) + (docLevel.failure?.length ?? 0) + (docLevel.informational?.length ?? 0) > 0) {
     return docLevel
   }
+
   const firstManifest = report.manifests?.[0]
   const perManifest = firstManifest?.validationResults as CrJsonValidationResults | undefined
+
   if (perManifest && (perManifest.success?.length ?? 0) + (perManifest.failure?.length ?? 0) + (perManifest.informational?.length ?? 0) > 0) {
     return {
       success: perManifest.success,
@@ -204,6 +215,7 @@ export function getActiveManifestValidationStatus(report: CrJson): CrJsonActiveM
       failure: perManifest.failure
     }
   }
+
   return docLevel ?? (perManifest ? { success: perManifest.success, informational: perManifest.informational, failure: perManifest.failure } : undefined)
 }
 
@@ -217,12 +229,15 @@ export function legacyToCrJson(legacy: Record<string, unknown>): CrJson {
   const validationResults = (legacy.validation_results ?? legacy.validationResults) as CrJsonValidationResults | undefined
 
   const manifests: CrJsonManifestEntry[] = []
+
   if (manifestsObj && typeof manifestsObj === 'object') {
     const labels = Object.keys(manifestsObj)
+
     // Put active manifest first (crJSON convention)
     if (activeLabel && manifestsObj[activeLabel]) {
       manifests.push(legacyManifestToCrJsonEntry(activeLabel, manifestsObj[activeLabel]))
     }
+
     for (const label of labels) {
       if (label !== activeLabel && manifestsObj[label]) {
         manifests.push(legacyManifestToCrJsonEntry(label, manifestsObj[label]))
@@ -237,10 +252,12 @@ export function legacyToCrJson(legacy: Record<string, unknown>): CrJson {
     },
     manifests
   }
+
   if (validationResults && typeof validationResults === 'object') {
     cr.validationResults = validationResults
     // Propagate into first manifest so per-manifest readers (and c2pa-rs-style crJSON) see it
     const activeStatus = validationResults.activeManifest ?? validationResults
+
     if (manifests.length > 0 && activeStatus && typeof activeStatus === 'object') {
       manifests[0].validationResults = {
         success: (activeStatus as CrJsonActiveManifestStatus).success,
@@ -249,15 +266,18 @@ export function legacyToCrJson(legacy: Record<string, unknown>): CrJson {
       }
     }
   }
+
   return cr
 }
 
 function legacyManifestToCrJsonEntry(label: string, m: Record<string, unknown>): CrJsonManifestEntry {
   const assertionsArray = (m.assertions ?? []) as Array<{ label: string; data: unknown }>
   const assertions: Record<string, unknown> = {}
+
   for (const a of assertionsArray) {
     if (a?.label != null) assertions[a.label] = a.data
   }
+
   const claim = m.claim_generator_info != null || m.instance_id != null
     ? {
         claim_generator: m.claim_generator,
diff --git a/src/lib/sdk.ts b/src/lib/sdk.ts
index bfdbae7a0..fa7118641 100644
--- a/src/lib/sdk.ts
+++ b/src/lib/sdk.ts
@@ -15,6 +15,7 @@ export const getSdk = pMemoize(createSdk);
 
 async function loadTrustResource(file: string): Promise<string> {
   const res = await fetch(`/trust/${file}`);
+
   return res.text();
 }
 
@@ -26,6 +27,7 @@ async function getOfficialAnchors(): Promise<string> {
         'https://raw.githubusercontent.com/c2pa-org/conformance-public/refs/heads/main/trust-list/C2PA-TSA-TRUST-LIST.pem',
       ].map(async (url) => {
         const res = await fetch(url);
+
         return res.text();
       }),
     )
diff --git a/src/lib/selectors/doNotTrain.ts b/src/lib/selectors/doNotTrain.ts
index f4ee52327..45c8ea95a 100644
--- a/src/lib/selectors/doNotTrain.ts
+++ b/src/lib/selectors/doNotTrain.ts
@@ -5,15 +5,21 @@ import type { Manifest } from '@contentauth/c2pa-web';
 export function selectDoNotTrain(manifest: Manifest): boolean {
   // Check for the explicit do not train/mine assertion
   const trainingAssertions = manifest.assertions?.['c2pa.training-mining'];
+
   if (trainingAssertions) {
-    const entry = (trainingAssertions as any)?.data?.entries?.find((e: any) => 
+    type TrainingEntry = { use: string; c2pa_manifest: boolean | string };
+    type TrainingMining = { data?: { entries?: TrainingEntry[] } };
+    const entry = (trainingAssertions as TrainingMining)?.data?.entries?.find((e: TrainingEntry) =>
       e.use === 'notAllowed' && (e.c2pa_manifest === true || e.c2pa_manifest === 'true')
     );
+
     return !!entry;
   }
 
   // Fallback: Check c2pa.actions for specific 'not_trained' markers
-  const actionsAssertion = manifest.assertions?.['c2pa.actions'];
-  const actions = (actionsAssertion as any)?.data?.actions || [];
-  return actions.some((a: any) => a.action === 'c2pa.not_trained');
+  type ActionsAssertion = { data?: { actions?: Array<{ action: string }> } };
+  const actionsAssertion = manifest.assertions?.['c2pa.actions'] as ActionsAssertion | undefined;
+  const actions = actionsAssertion?.data?.actions ?? [];
+
+  return actions.some((a) => a.action === 'c2pa.not_trained');
 }
diff --git a/src/lib/selectors/editsAndActivity.ts b/src/lib/selectors/editsAndActivity.ts
index 3bc822e9a..862770d49 100644
--- a/src/lib/selectors/editsAndActivity.ts
+++ b/src/lib/selectors/editsAndActivity.ts
@@ -1,3 +1,5 @@
+// Copyright 2021-2024 Adobe, Copyright 2026 The C2PA Contributors
+
 import type { Manifest } from '@contentauth/c2pa-web';
 
 export interface TranslatedDictionaryCategory {
@@ -9,22 +11,26 @@ export interface TranslatedDictionaryCategory {
 
 export async function selectEditsAndActivity(
   manifest: Manifest,
-  locale: string
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  _locale: string
 ): Promise<TranslatedDictionaryCategory[]> {
   // Handle Legacy SDK (Map), Native SDK (Array), and crJSON (Object)
-  let actionsAssertion;
+  type ActionItem = { label?: string; action: string };
+  type ActionsAssertion = { data?: { actions?: ActionItem[] }; actions?: ActionItem[] };
+  let actionsAssertion: ActionsAssertion | undefined;
+
   if (manifest.assertions instanceof Map) {
     actionsAssertion = manifest.assertions.get('c2pa.actions.v2')?.[0] || manifest.assertions.get('c2pa.actions')?.[0] || manifest.assertions.get('c2pa.actions.v2') || manifest.assertions.get('c2pa.actions');
   } else if (Array.isArray(manifest.assertions)) {
-    actionsAssertion = manifest.assertions.find((a: any) => a.label === 'c2pa.actions' || a.label === 'c2pa.actions.v2');
+    actionsAssertion = manifest.assertions.find((a: { label?: string }) => a.label === 'c2pa.actions' || a.label === 'c2pa.actions.v2');
   } else {
     actionsAssertion = manifest.assertions?.['c2pa.actions.v2'] || manifest.assertions?.['c2pa.actions'];
   }
-  
-  const actions = (actionsAssertion as any)?.data?.actions || (actionsAssertion as any)?.actions || [];
+
+  const actions = actionsAssertion?.data?.actions || actionsAssertion?.actions || [];
 
   const uniqueActionTypes = new Set<string>();
-  actions.forEach((a: any) => uniqueActionTypes.add(a.action));
+  actions.forEach((a) => uniqueActionTypes.add(a.action));
 
   const results: TranslatedDictionaryCategory[] = [];
 
diff --git a/src/lib/selectors/generativeInfo.ts b/src/lib/selectors/generativeInfo.ts
index 2347ec642..12f65f1a0 100644
--- a/src/lib/selectors/generativeInfo.ts
+++ b/src/lib/selectors/generativeInfo.ts
@@ -11,32 +11,44 @@ interface SdkGenerativeInfo {
   type: string;
 }
 
+type GenActionItem = {
+  label?: string;
+  action?: string;
+  digitalSourceType?: string;
+  softwareAgent?: string;
+  parameters?: { digitalSourceType?: string };
+};
+
+type GenActionsAssertion = { data?: { actions?: GenActionItem[] } };
+
 function sdkSelectGenerativeInfo(manifest: Manifest): SdkGenerativeInfo[] {
   // Handle both native SDK array structures and crJSON maps
   const isArray = Array.isArray(manifest.assertions);
-  const actionsAssertion = isArray 
-    ? manifest.assertions.find((a: any) => a.label === 'c2pa.actions' || a.label === 'c2pa.actions.v2')
+  const actionsAssertion = isArray
+    ? manifest.assertions.find((a: { label?: string }) => a.label === 'c2pa.actions' || a.label === 'c2pa.actions.v2')
     : (manifest.assertions?.['c2pa.actions.v2'] || manifest.assertions?.['c2pa.actions']);
-    
-  const actions = (actionsAssertion as any)?.data?.actions || [];
-  
+
+  const actions = (actionsAssertion as GenActionsAssertion)?.data?.actions || [];
+
   return actions
-    .filter((a: any) => {
+    .filter((a) => {
       // For created/edited actions, inspect the IPTC digitalSourceType for AI definitions
       const sourceType = a.digitalSourceType || a.parameters?.digitalSourceType || '';
+
       return sourceType.toLowerCase().includes('algorithmicmedia');
     })
-    .map((a: any) => {
+    .map((a) => {
       const rawType = a.digitalSourceType || a.parameters?.digitalSourceType;
       // The UI expects the IPTC slug, not the full absolute URI
-      const typeSlug = typeof rawType === 'string' ? rawType.split('/').pop() : 'legacy';
-      
+      const typeSlug = typeof rawType === 'string' ? (rawType.split('/').pop() ?? 'legacy') : 'legacy';
+
       return {
         softwareAgent: a.softwareAgent || 'Unknown',
         type: typeSlug
       };
     });
 }
+
 import { filter, flow, uniqBy } from 'lodash/fp';
 import startsWith from 'lodash/startsWith';
 
diff --git a/src/lib/selectors/producer.ts b/src/lib/selectors/producer.ts
index 9f6193c96..ec8f737cd 100644
--- a/src/lib/selectors/producer.ts
+++ b/src/lib/selectors/producer.ts
@@ -7,25 +7,33 @@ interface ProducerInfo {
   url?: string;
 }
 
+type CreativeWorkAssertion = { data?: { author?: { name?: string; url?: string; sameAs?: string | string[] } | Array<{ name?: string; url?: string }> } };
+type XmpAssertion = { data?: { 'dc:creator'?: string | string[] } };
+
 export function selectProducer(manifest: Manifest): ProducerInfo | null {
   // 1. Check CreativeWork schema
-  const creativeWork = (manifest.assertions?.['stds.schema-org.CreativeWork'] as any)?.data;
+  const creativeWork = (manifest.assertions?.['stds.schema-org.CreativeWork'] as CreativeWorkAssertion)?.data;
+
   if (creativeWork?.author) {
     const author = Array.isArray(creativeWork.author) ? creativeWork.author[0] : creativeWork.author;
+
     if (author?.name) {
       return { name: author.name, url: author.url };
     }
   }
 
   // 2. Check XMP producer/creator
-  const xmp = (manifest.assertions?.['stds.xmp'] as any)?.data;
+  const xmp = (manifest.assertions?.['stds.xmp'] as XmpAssertion)?.data;
+
   if (xmp?.['dc:creator']) {
     const creator = Array.isArray(xmp['dc:creator']) ? xmp['dc:creator'][0] : xmp['dc:creator'];
+
     return { name: creator };
   }
 
   // 3. Fallback to certificate subject common name
   const commonName = manifest.signature_info?.common_name;
+
   if (commonName) {
     return { name: commonName };
   }
diff --git a/src/lib/selectors/reviewRatings.ts b/src/lib/selectors/reviewRatings.ts
index d30415f5d..b95d65cb3 100644
--- a/src/lib/selectors/reviewRatings.ts
+++ b/src/lib/selectors/reviewRatings.ts
@@ -13,8 +13,9 @@ export function selectReviewRatings(manifest: Manifest) {
     },
     [],
   );
+  type ActionsReviewAssertion = { data?: { metadata?: { reviewRatings?: ReviewRating[] } } };
   const actionRatings =
-    (manifest.assertions?.['c2pa.actions'] as any)?.data?.metadata?.reviewRatings ?? [];
+    (manifest.assertions?.['c2pa.actions'] as ActionsReviewAssertion)?.data?.metadata?.reviewRatings ?? [];
   const reviewRatings = [...ingredientRatings, ...actionRatings];
 
   return {
diff --git a/src/lib/selectors/socialAccounts.ts b/src/lib/selectors/socialAccounts.ts
index d835d7391..b4ff40947 100644
--- a/src/lib/selectors/socialAccounts.ts
+++ b/src/lib/selectors/socialAccounts.ts
@@ -18,6 +18,7 @@ export function selectSocialAccounts(manifest: Manifest): SocialAccount[] {
   for (const cred of credentials) {
     // Simplified mapping logic for standard social media VC schemas
     const vcData = cred.credentialSubject || {};
+
     if (vcData?.account?.service && vcData?.account?.identifier) {
       accounts.push({
         '@id': vcData.id || '',
@@ -29,7 +30,9 @@ export function selectSocialAccounts(manifest: Manifest): SocialAccount[] {
   }
 
   // Also check standard CreativeWork assertions for "sameAs" social URLs
-  const creativeWork = (manifest.assertions?.['stds.schema-org.CreativeWork'] as any)?.data;
+  type CreativeWorkAssertion = { data?: { author?: { sameAs?: string | string[] } } };
+  const creativeWork = (manifest.assertions?.['stds.schema-org.CreativeWork'] as CreativeWorkAssertion)?.data;
+
   if (creativeWork?.author?.sameAs) {
     const urls = Array.isArray(creativeWork.author.sameAs) 
       ? creativeWork.author.sameAs 
diff --git a/src/lib/selectors/web3Info.ts b/src/lib/selectors/web3Info.ts
index ee884e028..7527924a9 100644
--- a/src/lib/selectors/web3Info.ts
+++ b/src/lib/selectors/web3Info.ts
@@ -17,8 +17,10 @@ declare module '@contentauth/c2pa-web' {
   }
 }
 
+type CryptoAddressAssertion = { data?: Record<string, string[]> };
+
 export function selectWeb3(manifest: Manifest): [string, string[]][] {
-  const cryptoEntries = (manifest.assertions?.['adobe.crypto.addresses'] as any)?.data ?? {};
+  const cryptoEntries = (manifest.assertions?.['adobe.crypto.addresses'] as CryptoAddressAssertion)?.data ?? {};
 
   return (Object.entries(cryptoEntries) as [string, string[]][]).filter(
     ([type, [address]]) => address && ['solana', 'ethereum'].includes(type),
diff --git a/src/lib/selectors/website.ts b/src/lib/selectors/website.ts
index 64faf5e15..8119bee9e 100644
--- a/src/lib/selectors/website.ts
+++ b/src/lib/selectors/website.ts
@@ -17,10 +17,13 @@ declare module '@contentauth/c2pa-web' {
   }
 }
 
+type AssetRefAssertion = { data?: { references?: Array<{ reference?: { uri?: string } }> } };
+type CreativeWorkAssertion = { data?: { url?: string } };
+
 export function selectWebsite(manifest: Manifest): string | null {
   const site =
-    (manifest.assertions?.['c2pa.asset-ref'] as any)?.data?.references?.[0]?.reference?.uri ??
-    (manifest.assertions?.['stds.schema-org.CreativeWork'] as any)?.data?.url;
+    (manifest.assertions?.['c2pa.asset-ref'] as AssetRefAssertion)?.data?.references?.[0]?.reference?.uri ??
+    (manifest.assertions?.['stds.schema-org.CreativeWork'] as CreativeWorkAssertion)?.data?.url;
 
   return site && isSecureUrl(site) ? site : null;
 }
diff --git a/src/routes/verify/components/AssetInfo/AssetInfoIssuerDate.svelte b/src/routes/verify/components/AssetInfo/AssetInfoIssuerDate.svelte
index 9259b6d9b..d5423e628 100644
--- a/src/routes/verify/components/AssetInfo/AssetInfoIssuerDate.svelte
+++ b/src/routes/verify/components/AssetInfo/AssetInfoIssuerDate.svelte
@@ -5,11 +5,9 @@
   import Description from '$src/components/typography/Description.svelte';
   import type { ManifestData } from '$src/lib/asset';
   import { _ } from 'svelte-i18n';
-  import AssetInfoDate from './AssetInfoDate.svelte';
 
   export let manifestData: ManifestData | null;
-  export let trustSource: 'official' | 'legacy' | 'none' = 'none';
-  $: date = manifestData?.date;
+  export const trustSource: 'official' | 'legacy' | 'none' = 'none';
   $: issuer = manifestData?.signatureInfo?.issuer;
 </script>
 
diff --git a/src/routes/verify/components/DetailedInfo/AboutSection/AboutSection.svelte b/src/routes/verify/components/DetailedInfo/AboutSection/AboutSection.svelte
index 8dc14aaa6..de003cbf5 100644
--- a/src/routes/verify/components/DetailedInfo/AboutSection/AboutSection.svelte
+++ b/src/routes/verify/components/DetailedInfo/AboutSection/AboutSection.svelte
@@ -12,7 +12,8 @@
   export let trustSource: 'official' | 'legacy' | 'none' = 'none';
 
   // Extract extended X.509 fields (Catching various Rust/JS SDK naming conventions)
-  $: sigInfo = manifestData.signatureInfo as any;
+  type ExtendedSigInfo = { organization_unit?: string; organizational_unit?: string; organizationUnit?: string; org_unit?: string; ou?: string; country?: string; country_name?: string; countryName?: string; c?: string };
+  $: sigInfo = manifestData.signatureInfo as ExtendedSigInfo;
   $: orgUnit = sigInfo?.organization_unit || sigInfo?.organizational_unit || sigInfo?.organizationUnit || sigInfo?.org_unit || sigInfo?.ou;
   $: country = sigInfo?.country || sigInfo?.country_name || sigInfo?.countryName || sigInfo?.c;
 </script>
@@ -26,7 +27,7 @@
         commonName={manifestData.signatureInfo?.common_name} 
         issuer={manifestData.signatureInfo?.issuer}
         organizationalUnit={orgUnit}
-        country={country}
+        {country}
         {trustSource} 
       />
     {/if}
diff --git a/src/routes/verify/components/DetailedInfo/AboutSection/IssuedBySection.svelte b/src/routes/verify/components/DetailedInfo/AboutSection/IssuedBySection.svelte
index 21159186c..9f9d060e7 100644
--- a/src/routes/verify/components/DetailedInfo/AboutSection/IssuedBySection.svelte
+++ b/src/routes/verify/components/DetailedInfo/AboutSection/IssuedBySection.svelte
@@ -22,6 +22,7 @@
     if (issuer) params.set('o', issuer);
     if (organizationalUnit) params.set('ou', organizationalUnit);
     if (country) params.set('c', country);
+
     return `https://spec.c2pa.org/conformance-explorer/?${params.toString()}`;
   })();
 </script>
@@ -71,6 +72,7 @@
     {#if showTooltip}
       <Tooltip showTooltip on:showToolip={() => (showTooltip = !showTooltip)}
         ><div slot="tooltip">
+          <!-- eslint-disable-next-line svelte/no-at-html-tags -->
           {@html $_('sidebar.verify.about.issuedby.tooltip')}
         </div>
       </Tooltip>
diff --git a/src/routes/verify/components/TreeView/TreeL1.svelte b/src/routes/verify/components/TreeView/TreeL1.svelte
index 94e0e6902..f8d110f7a 100644
--- a/src/routes/verify/components/TreeView/TreeL1.svelte
+++ b/src/routes/verify/components/TreeView/TreeL1.svelte
@@ -32,7 +32,6 @@
   $: removeL1 = transformScale === 0.125 ? true : false;
   $: scale = 0.5 / transformScale;
   $: L1margin = transformScale >= 0.25 ? 0.5 : transformScale / 0.25;
-  $: trustSource = $assetStore.trustSource;
 </script>
 
 <div
diff --git a/src/routes/verify/stores/c2paReader.ts b/src/routes/verify/stores/c2paReader.ts
index f7f693c60..040fad77f 100644
--- a/src/routes/verify/stores/c2paReader.ts
+++ b/src/routes/verify/stores/c2paReader.ts
@@ -14,7 +14,7 @@ import LegacyCredentialModal from '../components/modals/LegacyCredentialModal/Le
 
 interface SourceData {
   assetMap: AssetDataMap;
-  data: any; // Raw crJSON manifest store
+  data: unknown;
 }
 
 export type SourceState = Loadable<SourceData>;
@@ -33,32 +33,11 @@ const mimeTypeCorrections = {
   'image/dng': 'image/x-adobe-dng',
 };
 
-import { legacyToCrJson, type CrJson } from '$lib/crjson';
-
-// Helper to extract all manifest labels that failed trust validation in a given crJSON store
-function getUntrustedManifestLabels(store: CrJson): Set<string> {
-  const untrustedLabels = new Set<string>();
-  const isTrustError = (s: any) => s.code.includes('signingCredential');
-
-  // 1. Check Root
-  const rootFailures = store.validationResults?.activeManifest?.failure || [];
-  const activeLabel = store.manifests[0]?.label;
-  if (activeLabel && rootFailures.some(isTrustError)) {
-    untrustedLabels.add(activeLabel);
-  }
-
-  // 2. Check EVERY manifest in the store (Active + Ingredients)
-  for (const manifest of store.manifests) {
-    // Check the manifest object itself
-    const mFailures = manifest.validationResults?.failure || [];
-    const mStatuses = manifest.validationStatus || [];
-    if (mFailures.some(isTrustError) || mStatuses.some(isTrustError)) {
-      untrustedLabels.add(manifest.label);
-    }
-  }
-
-  return untrustedLabels;
-}
+type ValidationStatus = { code: string };
+type TrustSource = 'official' | 'legacy' | 'none';
+type TrustedIngredient = { trust_source?: TrustSource; active_manifest?: string; validation_status?: ValidationStatus[] };
+type TrustedManifest = { trust_source?: TrustSource; ingredients?: TrustedIngredient[] };
+type ValidationDelta = { ingredientAssertionURI?: string; validationDeltas?: { failure?: ValidationStatus[] } };
 
 export function createC2paReader(): C2paReaderStore {
   let dispose: () => void;
@@ -112,7 +91,7 @@ export function createC2paReader(): C2paReaderStore {
 
         // PASS 1: Validate against Official Trust List
         const officialSettings = await getOfficialToolkitSettings();
-        let reader = await sdk.reader.fromBlob(source.type || 'application/octet-stream', source, officialSettings);
+        const reader = await sdk.reader.fromBlob(source.type || 'application/octet-stream', source, officialSettings);
 
         if (!reader) {
           throw new Error('No C2PA manifest found in this file');
@@ -139,18 +118,17 @@ export function createC2paReader(): C2paReaderStore {
             reader.free();
             currentReader = legacyReader;
 
-            const isTrustError = (s: any) => s.code.includes('signingCredential.untrusted') || s.code.includes('signingCredential.invalid');
-            const isCryptoValid = (s: any) => s.code.includes('signingCredential.trusted') || s.code.includes('claimSignature.validated');
+            const isTrustError = (s: ValidationStatus) => s.code.includes('signingCredential.untrusted') || s.code.includes('signingCredential.invalid');
 
             // 4a. Tag the Active Manifest
-            const p1ActiveV3 = rawManifestStore.validation_results?.activeManifest?.failure || [];
-            const p1ActiveV2 = rawManifestStore.manifests?.[rawManifestStore.active_manifest || '']?.validation_status || [];
+            const p1ActiveV3 = (rawManifestStore.validation_results?.activeManifest?.failure || []) as ValidationStatus[];
+            const p1ActiveV2 = (rawManifestStore.manifests?.[rawManifestStore.active_manifest || '']?.validation_status || []) as ValidationStatus[];
             const wasActiveUntrusted = p1ActiveV3.some(isTrustError) || p1ActiveV2.some(isTrustError);
             const isFinalTrusted = finalStore.validation_state === 'Trusted';
             
             if (finalStore.manifests && finalStore.active_manifest && finalStore.manifests[finalStore.active_manifest]) {
-              const activeMan = finalStore.manifests[finalStore.active_manifest];
-              
+              const activeMan = finalStore.manifests[finalStore.active_manifest] as unknown as TrustedManifest;
+
               // If the root is Trusted, default to official, then downgrade if Pass 1 failed.
               if (isFinalTrusted) {
                 activeMan.trust_source = wasActiveUntrusted ? 'legacy' : 'official';
@@ -160,32 +138,32 @@ export function createC2paReader(): C2paReaderStore {
             }
 
             // 4b. Tag ALL Ingredients across the entire provenance tree
-            const p1Deltas = rawManifestStore.validation_results?.ingredientDeltas || [];
-            
-            Object.entries(finalStore.manifests || {}).forEach(([label, manifest]: [string, any]) => {
+            const p1Deltas = (rawManifestStore.validation_results?.ingredientDeltas || []) as ValidationDelta[];
+
+            (Object.entries(finalStore.manifests || {}) as Array<[string, TrustedManifest]>).forEach(([label, manifest]) => {
               const p1Manifest = rawManifestStore.manifests?.[label];
-              
+
               if (manifest.ingredients && p1Manifest?.ingredients) {
-                manifest.ingredients.forEach((ingredient: any, index: number) => {
+                manifest.ingredients.forEach((ingredient, index) => {
                   // ZERO TRUST DEFAULT: Unverified assets get no trust credentials
                   ingredient.trust_source = 'none';
 
                   if (ingredient.active_manifest) {
-                    const p1Ing = p1Manifest.ingredients[index];
+                    const p1Ing = p1Manifest.ingredients?.[index];
                     const subLabel = ingredient.active_manifest;
                     const p1SubManifest = subLabel ? rawManifestStore.manifests?.[subLabel] : null;
 
                     // 1. Check the Ingredient Pointer (V2 standard)
-                    const p1V2_ing = p1Ing?.validation_status || [];
+                    const p1V2_ing = (p1Ing?.validation_status || []) as ValidationStatus[];
 
                     // 2. Check the actual Sub-Manifest directly (V2 + V3 standards)
                     // NOTE: In V3, the sub-manifest's own results are stored under .activeManifest
-                    const p1V2_sub = p1SubManifest?.validation_status || [];
-                    const p1V3_sub = p1SubManifest?.validation_results?.activeManifest?.failure || [];
+                    const p1V2_sub = (p1SubManifest?.validation_status || []) as ValidationStatus[];
+                    const p1V3_sub = (p1SubManifest?.validation_results?.activeManifest?.failure || []) as ValidationStatus[];
 
                     // 3. Check the Root Deltas (V3 standard)
-                    const p1Delta = p1Deltas.find((d: any) => 
-                      d.ingredientAssertionURI?.includes(label) && 
+                    const p1Delta = p1Deltas.find((d) =>
+                      d.ingredientAssertionURI?.includes(label) &&
                       d.ingredientAssertionURI?.includes('c2pa.ingredient')
                     );
                     const p1V3_delta = p1Delta?.validationDeltas?.failure || [];
@@ -212,12 +190,13 @@ export function createC2paReader(): C2paReaderStore {
             
             // Fallback: If root is Trusted, entire tree is official.
             const isTrusted = finalStore.validation_state === 'Trusted';
-            Object.entries(finalStore.manifests || {}).forEach(([label, manifest]: [string, any]) => {
+            (Object.entries(finalStore.manifests || {}) as Array<[string, TrustedManifest]>).forEach(([label, manifest]) => {
               if (label === finalStore.active_manifest) {
                 manifest.trust_source = isTrusted ? 'official' : 'none';
               }
+
               if (manifest.ingredients) {
-                manifest.ingredients.forEach((ing: any) => {
+                manifest.ingredients.forEach((ing) => {
                   ing.trust_source = (isTrusted && ing.active_manifest) ? 'official' : 'none';
                 });
               }
@@ -226,12 +205,13 @@ export function createC2paReader(): C2paReaderStore {
         } else {
           // Pass 1 had no trust issues (Could be Trusted or Hard Invalid)
           const isTrusted = finalStore.validation_state === 'Trusted';
-          Object.entries(finalStore.manifests || {}).forEach(([label, manifest]: [string, any]) => {
+          (Object.entries(finalStore.manifests || {}) as Array<[string, TrustedManifest]>).forEach(([label, manifest]) => {
             if (label === finalStore.active_manifest) {
               manifest.trust_source = isTrusted ? 'official' : 'none';
             }
+
             if (manifest.ingredients) {
-              manifest.ingredients.forEach((ing: any) => {
+              manifest.ingredients.forEach((ing) => {
                 ing.trust_source = (isTrusted && ing.active_manifest) ? 'official' : 'none';
               });
             }
@@ -239,7 +219,8 @@ export function createC2paReader(): C2paReaderStore {
         }
 
         const { assetMap, dispose: assetMapDisposer } =
-          await resultToAssetMap({ manifestStore: finalStore, source });  
+          await resultToAssetMap({ manifestStore: finalStore, source });
+  
         dispose = () => {
           assetMapDisposer();
           currentReader.free();
@@ -279,5 +260,6 @@ export function createC2paReader(): C2paReaderStore {
 async function hasLegacyCredentials(source: Blob | File): Promise<boolean> {
   const legacySdk = await getLegacySdk();
   const legacyResult = await legacySdk.processImage(source);
+
   return legacyResult.exists;
 }

From c8b42e403aae8e977fdde44326649ffdc7d646da Mon Sep 17 00:00:00 2001
From: Sherif Hanna <sherifhanna@google.com>
Date: Thu, 30 Apr 2026 19:33:06 +0000
Subject: [PATCH 2/2] fix: resolve all svelte-check and SSR build errors after
 SDK migration

---
 package.json                                  |   1 +
 pnpm-lock.yaml                                |  25 +++
 .../EmbeddedIcon/EmbeddedIcon.svelte          |   6 +-
 src/lib/asset.ts                              |  33 ++-
 src/lib/crjson.ts                             |  13 +-
 src/lib/exif.ts                               |  26 ++-
 src/lib/selectors/autoDubInfo.ts              |  33 ++-
 src/lib/selectors/doNotTrain.ts               |  45 ++++-
 src/lib/selectors/editsAndActivity.ts         |  29 ++-
 src/lib/selectors/generativeInfo.ts           |  66 ++++--
 src/lib/selectors/producer.ts                 |  36 +++-
 src/lib/selectors/reviewRatings.ts            |  18 +-
 src/lib/selectors/socialAccounts.ts           |  22 +-
 src/lib/selectors/validationResult.ts         |   7 +-
 src/lib/selectors/web3Info.ts                 |  18 +-
 src/lib/selectors/website.ts                  |  35 +++-
 .../AssetInfo/AssetInfoIssuerDate.svelte      |   6 +-
 .../AboutSection/AboutSection.svelte          |   4 +-
 src/routes/verify/stores/c2paReader.ts        | 189 +++++++++---------
 vite.config.js                                |   7 +-
 20 files changed, 447 insertions(+), 172 deletions(-)

diff --git a/package.json b/package.json
index c606b8dde..333d3f24d 100644
--- a/package.json
+++ b/package.json
@@ -154,6 +154,7 @@
     "svelte-css-vars": "^0.0.3",
     "svelte-focus-trap": "^1.2.0",
     "svelte-i18n": "^3.7.4",
+    "intl-messageformat": "9.13.0",
     "svelte-meta-tags": "^3.0.4",
     "svelte-modals": "^1.3.0",
     "tippy.js": "^6.3.7"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b4697719b..743ac479d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -89,6 +89,9 @@ importers:
       interactjs:
         specifier: ^1.10.19
         version: 1.10.27
+      intl-messageformat:
+        specifier: 9.13.0
+        version: 9.13.0
       lodash:
         specifier: ^4.17.21
         version: 4.17.21
@@ -1809,78 +1812,92 @@ packages:
     resolution: {integrity: sha512-RXwd0CgG+uPRX5YYrkzKyalt2OJYRiJQ8ED/fi1tq9WQW2jsQIn0tqrlR5l5dr/rjqq6AHAxURhj2DVjyQWSOA==}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@img/sharp-libvips-linux-arm@1.2.0':
     resolution: {integrity: sha512-mWd2uWvDtL/nvIzThLq3fr2nnGfyr/XMXlq8ZJ9WMR6PXijHlC3ksp0IpuhK6bougvQrchUAfzRLnbsen0Cqvw==}
     cpu: [arm]
     os: [linux]
+    libc: [glibc]
 
   '@img/sharp-libvips-linux-ppc64@1.2.0':
     resolution: {integrity: sha512-Xod/7KaDDHkYu2phxxfeEPXfVXFKx70EAFZ0qyUdOjCcxbjqyJOEUpDe6RIyaunGxT34Anf9ue/wuWOqBW2WcQ==}
     cpu: [ppc64]
     os: [linux]
+    libc: [glibc]
 
   '@img/sharp-libvips-linux-s390x@1.2.0':
     resolution: {integrity: sha512-eMKfzDxLGT8mnmPJTNMcjfO33fLiTDsrMlUVcp6b96ETbnJmd4uvZxVJSKPQfS+odwfVaGifhsB07J1LynFehw==}
     cpu: [s390x]
     os: [linux]
+    libc: [glibc]
 
   '@img/sharp-libvips-linux-x64@1.2.0':
     resolution: {integrity: sha512-ZW3FPWIc7K1sH9E3nxIGB3y3dZkpJlMnkk7z5tu1nSkBoCgw2nSRTFHI5pB/3CQaJM0pdzMF3paf9ckKMSE9Tg==}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@img/sharp-libvips-linuxmusl-arm64@1.2.0':
     resolution: {integrity: sha512-UG+LqQJbf5VJ8NWJ5Z3tdIe/HXjuIdo4JeVNADXBFuG7z9zjoegpzzGIyV5zQKi4zaJjnAd2+g2nna8TZvuW9Q==}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@img/sharp-libvips-linuxmusl-x64@1.2.0':
     resolution: {integrity: sha512-SRYOLR7CXPgNze8akZwjoGBoN1ThNZoqpOgfnOxmWsklTGVfJiGJoC/Lod7aNMGA1jSsKWM1+HRX43OP6p9+6Q==}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@img/sharp-linux-arm64@0.34.3':
     resolution: {integrity: sha512-QdrKe3EvQrqwkDrtuTIjI0bu6YEJHTgEeqdzI3uWJOH6G1O8Nl1iEeVYRGdj1h5I21CqxSvQp1Yv7xeU3ZewbA==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@img/sharp-linux-arm@0.34.3':
     resolution: {integrity: sha512-oBK9l+h6KBN0i3dC8rYntLiVfW8D8wH+NPNT3O/WBHeW0OQWCjfWksLUaPidsrDKpJgXp3G3/hkmhptAW0I3+A==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm]
     os: [linux]
+    libc: [glibc]
 
   '@img/sharp-linux-ppc64@0.34.3':
     resolution: {integrity: sha512-GLtbLQMCNC5nxuImPR2+RgrviwKwVql28FWZIW1zWruy6zLgA5/x2ZXk3mxj58X/tszVF69KK0Is83V8YgWhLA==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [ppc64]
     os: [linux]
+    libc: [glibc]
 
   '@img/sharp-linux-s390x@0.34.3':
     resolution: {integrity: sha512-3gahT+A6c4cdc2edhsLHmIOXMb17ltffJlxR0aC2VPZfwKoTGZec6u5GrFgdR7ciJSsHT27BD3TIuGcuRT0KmQ==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [s390x]
     os: [linux]
+    libc: [glibc]
 
   '@img/sharp-linux-x64@0.34.3':
     resolution: {integrity: sha512-8kYso8d806ypnSq3/Ly0QEw90V5ZoHh10yH0HnrzOCr6DKAPI6QVHvwleqMkVQ0m+fc7EH8ah0BB0QPuWY6zJQ==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@img/sharp-linuxmusl-arm64@0.34.3':
     resolution: {integrity: sha512-vAjbHDlr4izEiXM1OTggpCcPg9tn4YriK5vAjowJsHwdBIdx0fYRsURkxLG2RLm9gyBq66gwtWI8Gx0/ov+JKQ==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@img/sharp-linuxmusl-x64@0.34.3':
     resolution: {integrity: sha512-gCWUn9547K5bwvOn9l5XGAEjVTTRji4aPTqLzGXHvIr6bIDZKNTA34seMPgM0WmSf+RYBH411VavCejp3PkOeQ==}
     engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@img/sharp-wasm32@0.34.3':
     resolution: {integrity: sha512-+CyRcpagHMGteySaWos8IbnXcHgfDn7pO2fiC2slJxvNq9gDipYBN42/RagzctVRKgxATmfqOSulgZv5e1RdMg==}
@@ -3347,41 +3364,49 @@ packages:
     resolution: {integrity: sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@unrs/resolver-binding-linux-arm64-musl@1.11.1':
     resolution: {integrity: sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@unrs/resolver-binding-linux-ppc64-gnu@1.11.1':
     resolution: {integrity: sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==}
     cpu: [ppc64]
     os: [linux]
+    libc: [glibc]
 
   '@unrs/resolver-binding-linux-riscv64-gnu@1.11.1':
     resolution: {integrity: sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==}
     cpu: [riscv64]
     os: [linux]
+    libc: [glibc]
 
   '@unrs/resolver-binding-linux-riscv64-musl@1.11.1':
     resolution: {integrity: sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==}
     cpu: [riscv64]
     os: [linux]
+    libc: [musl]
 
   '@unrs/resolver-binding-linux-s390x-gnu@1.11.1':
     resolution: {integrity: sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==}
     cpu: [s390x]
     os: [linux]
+    libc: [glibc]
 
   '@unrs/resolver-binding-linux-x64-gnu@1.11.1':
     resolution: {integrity: sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@unrs/resolver-binding-linux-x64-musl@1.11.1':
     resolution: {integrity: sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@unrs/resolver-binding-wasm32-wasi@1.11.1':
     resolution: {integrity: sha512-5u4RkfxJm+Ng7IWgkzi3qrFOvLvQYnPBmjmZQ8+szTK/b31fQCnleNl1GgEt7nIsZRIf5PLhPwT0WM+q45x/UQ==}
diff --git a/src/components/EmbeddedIcon/EmbeddedIcon.svelte b/src/components/EmbeddedIcon/EmbeddedIcon.svelte
index 2c89a618b..6476e0b11 100644
--- a/src/components/EmbeddedIcon/EmbeddedIcon.svelte
+++ b/src/components/EmbeddedIcon/EmbeddedIcon.svelte
@@ -4,17 +4,13 @@
 <script lang="ts">
   import type { ClaimGeneratorDisplayInfo } from '$src/lib/asset';
 
-  interface DisposableBlobUrl {
-    url: string;
-    dispose: () => void;
-  }
   import { onMount } from 'svelte';
 
   export let generator: ClaimGeneratorDisplayInfo;
   let iconUrl: string | undefined;
 
   onMount(() => {
-    let dispose: DisposableBlobUrl['dispose'];
+    let dispose: () => void = () => {};
 
     if (generator.icon) {
       // The new SDK requires the active reader instance to fetch embedded resources.
diff --git a/src/lib/asset.ts b/src/lib/asset.ts
index 512ef8135..c3d10613a 100644
--- a/src/lib/asset.ts
+++ b/src/lib/asset.ts
@@ -146,7 +146,7 @@ export async function resultToAssetMap({
   dbg('Runtime validation statuses by manifest label', runtimeValidationStatuses);
 
   const activeManifestValidationResults =
-    manifestStore?.validation_results?.activeManifest;
+    manifestStore?.validation_results?.activeManifest ?? undefined;
 
   const rootValidationStatuses =
     runtimeValidationStatuses[activeManifestLabel] ?? [];
@@ -260,7 +260,7 @@ export async function resultToAssetMap({
       manifestData: await getManifestData(manifest, rootValidationResult),
       dataType: null,
       validationResult: rootValidationResult,
-      trustSource: (manifest as Manifest & { trust_source?: string }).trust_source || 'none',
+      trustSource: ((manifest as Manifest & { trust_source?: 'legacy' | 'none' | 'official' }).trust_source || 'none') as 'legacy' | 'none' | 'official',
     };
 
     if (thumbnail?.dispose) {
@@ -288,7 +288,7 @@ export async function resultToAssetMap({
     );
 
     const activeManifestValidationResults =
-      ingredient.validation_results?.activeManifest;
+      ingredient.validation_results?.activeManifest ?? undefined;
 
     let validationResult = selectValidationResult(
       ingredient.validation_status || [],
@@ -318,7 +318,7 @@ export async function resultToAssetMap({
       manifestData: await getManifestData(ingredientManifest, validationResult),
       dataType: getIngredientDataType(ingredient),
       validationResult,
-      trustSource: (ingredient as Ingredient & { trust_source?: string })?.trust_source || 'none',
+      trustSource: ((ingredient as Ingredient & { trust_source?: 'legacy' | 'none' | 'official' })?.trust_source || 'none') as 'legacy' | 'none' | 'official',
     };
 
     if (thumbnail?.dispose) {
@@ -338,9 +338,8 @@ export async function resultToAssetMap({
       return null;
     }
 
-    type ClaimGeneratorEntry = { name?: string; version?: string | null; icon?: Thumbnail | null };
-
-    function formattedGeneratorInfo(claim_generator: ClaimGeneratorEntry): ClaimGeneratorEntry {
+    /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
+    function formattedGeneratorInfo(claim_generator: any): any {
       const version = claim_generator?.version;
       claim_generator.version = version?.replace(/\([^()]*\)/g, '');
 
@@ -384,9 +383,25 @@ export async function resultToAssetMap({
         );
 
         if (editsAndActivity) {
-          const actionsAssertion = manifest.assertions?.['c2pa.actions'] as { data?: { metadata?: Record<string, unknown> } } | undefined;
+          const assertions = manifest.assertions;
+
+          let actionsAssertion: unknown;
+
+          if (Array.isArray(assertions)) {
+            actionsAssertion = assertions.find(
+              (a): a is { label: string; data: unknown } =>
+                typeof a === 'object' &&
+                a !== null &&
+                'label' in a &&
+                typeof (a as Record<string, unknown>)['label'] === 'string' &&
+                (a as Record<string, unknown>)['label'] === 'c2pa.actions'
+            );
+          } else if (assertions && typeof assertions === 'object') {
+            actionsAssertion = (assertions as Record<string, unknown>)['c2pa.actions'];
+          }
+
           const hasInference =
-            !!actionsAssertion?.data?.metadata?.['com.adobe.inference'];
+            !!(actionsAssertion as { data?: { metadata?: Record<string, unknown> } })?.data?.metadata?.['com.adobe.inference'];
 
           const filteredEditsAndActivity = editsAndActivity.filter(
             (value) => !!value.label,
diff --git a/src/lib/crjson.ts b/src/lib/crjson.ts
index 4eaaa8f29..ee9a15194 100644
--- a/src/lib/crjson.ts
+++ b/src/lib/crjson.ts
@@ -302,12 +302,15 @@ function legacyManifestToCrJsonEntry(label: string, m: Record<string, unknown>):
   const validationResults = m.validation_results ?? m.validationResults;
   const validationStatus = m.validation_status ?? m.validationStatus;
 
-  return {
+  const entry: CrJsonManifestEntry = {
     label,
     assertions,
-    ...(claim && { claim: claim as Record<string, unknown> }),
-    ...(signature && { signature }),
-    ...(validationResults && { validationResults: validationResults as CrJsonValidationResults }),
-    ...(validationStatus && { validationStatus: validationStatus as Record<string, unknown> })
   }
+
+  if (claim) entry.claim = claim as Record<string, unknown>;
+  if (signature) entry.signature = signature;
+  if (validationResults) entry.validationResults = validationResults as CrJsonValidationResults;
+  if (validationStatus) entry.validationStatus = validationStatus as Record<string, unknown>;
+
+  return entry;
 }
diff --git a/src/lib/exif.ts b/src/lib/exif.ts
index 5053375a3..adc5a8212 100644
--- a/src/lib/exif.ts
+++ b/src/lib/exif.ts
@@ -28,11 +28,7 @@ export interface ExifTags {
   'exif:offsettimeoriginal'?: string;
 }
 
-declare module 'c2pa' {
-  interface ExtendedAssertions {
-    'stds.exif': ExifTags;
-  }
-}
+
 
 function findExifValue(exif: ExifTags, locations: string[]) {
   return (
@@ -203,8 +199,24 @@ export function parseDateTime(exif: ExifTags): Date | null {
 }
 
 export function selectExif(manifest: Manifest): ExifSummary | null {
-  const assertion = manifest.assertions?.['stds.exif'];
-  const exif: ExifTags = (Array.isArray(assertion) ? assertion : [assertion]).reduce(
+  const assertions = manifest.assertions;
+  let assertion: unknown;
+
+  if (Array.isArray(assertions)) {
+    assertion = assertions.find(
+      (a): a is { label: string; data: unknown } =>
+        typeof a === 'object' &&
+        a !== null &&
+        'label' in a &&
+        typeof (a as Record<string, unknown>)['label'] === 'string' &&
+        (a as Record<string, unknown>)['label'] === 'stds.exif'
+    );
+  } else if (assertions && typeof assertions === 'object') {
+    assertion = (assertions as Record<string, unknown>)['stds.exif'];
+  }
+
+  const assertionData = (assertion as { data?: unknown })?.data;
+  const exif: ExifTags = (Array.isArray(assertionData) ? assertionData : [assertionData]).reduce(
     (acc, exif) => {
       const caseInsensitiveData = mapKeys(exif?.data, (_, key) => {
         return key.toLowerCase();
diff --git a/src/lib/selectors/autoDubInfo.ts b/src/lib/selectors/autoDubInfo.ts
index 867b58e7b..eb1adbd5c 100644
--- a/src/lib/selectors/autoDubInfo.ts
+++ b/src/lib/selectors/autoDubInfo.ts
@@ -14,19 +14,40 @@ export interface AutoDubInfo {
 }
 
 export function selectAutoDubInfo(manifest: Manifest): AutoDubInfo | null {
-  const actionAssertion = manifest.assertions?.['c2pa.actions.v2'];
+  const assertions = manifest.assertions;
+  let actionAssertion: unknown;
+
+  if (Array.isArray(assertions)) {
+    actionAssertion = assertions.find(
+      (a): a is { label: string; data: unknown } =>
+        typeof a === 'object' &&
+        a !== null &&
+        'label' in a &&
+        typeof (a as Record<string, unknown>)['label'] === 'string' &&
+        (a as Record<string, unknown>)['label'] === 'c2pa.actions.v2'
+    );
+  } else if (assertions && typeof assertions === 'object') {
+    actionAssertion = (assertions as Record<string, unknown>)['c2pa.actions.v2'];
+  }
 
   if (!actionAssertion) {
     return null;
   }
 
-  const dubbedAction = actionAssertion.data.actions.find(
+  type ActionItem = { 
+    action: string; 
+    changes?: Array<{ region?: Array<{ type?: string; item?: { value?: string } }> }>;
+    parameters?: unknown;
+  };
+  type ActionsAssertion = { data?: { actions?: ActionItem[] } };
+
+  const dubbedAction = (actionAssertion as ActionsAssertion).data?.actions?.find(
     ({ action }) => action === 'c2pa.dubbed',
   );
-  const translatedAction = actionAssertion.data.actions.find(
+  const translatedAction = (actionAssertion as ActionsAssertion).data?.actions?.find(
     ({ action }) => action === 'c2pa.translated',
   );
-  const editedAction = actionAssertion.data.actions.find(
+  const editedAction = (actionAssertion as ActionsAssertion).data?.actions?.find(
     ({ action }) => action === 'c2pa.edited',
   );
 
@@ -36,7 +57,7 @@ export function selectAutoDubInfo(manifest: Manifest): AutoDubInfo | null {
     )?.region;
     const dubbedIdentified = dubbedRegionOfInterest?.find(
       (region: Record<string, unknown>) => region.type === 'identified',
-    )?.item.value;
+    )?.item?.value;
     const hasLipsRoi = dubbedIdentified === 'lips';
 
     const editedRegionOfInterest = editedAction?.changes?.find(
@@ -44,7 +65,7 @@ export function selectAutoDubInfo(manifest: Manifest): AutoDubInfo | null {
     )?.region;
     const editedIdentified = editedRegionOfInterest?.find(
       (region: Record<string, unknown>) => region.type === 'identified',
-    )?.item.value;
+    )?.item?.value;
     const hasTranscriptRoi = editedIdentified === 'transcript';
 
     const translatedLanguageData = translatedAction?.parameters ?? null;
diff --git a/src/lib/selectors/doNotTrain.ts b/src/lib/selectors/doNotTrain.ts
index 45c8ea95a..09f6f2152 100644
--- a/src/lib/selectors/doNotTrain.ts
+++ b/src/lib/selectors/doNotTrain.ts
@@ -3,13 +3,36 @@
 import type { Manifest } from '@contentauth/c2pa-web';
 
 export function selectDoNotTrain(manifest: Manifest): boolean {
+  const assertions = manifest.assertions;
+
   // Check for the explicit do not train/mine assertion
-  const trainingAssertions = manifest.assertions?.['c2pa.training-mining'];
+  let trainingAssertions: unknown;
+
+  if (Array.isArray(assertions)) {
+    trainingAssertions = assertions.find(
+      (a): a is { label: string; data: unknown } =>
+        typeof a === 'object' &&
+        a !== null &&
+        'label' in a &&
+        typeof (a as Record<string, unknown>)['label'] === 'string' &&
+        (a as Record<string, unknown>)['label'] === 'c2pa.training-mining'
+    );
+  } else if (assertions && typeof assertions === 'object') {
+    trainingAssertions = (assertions as Record<string, unknown>)['c2pa.training-mining'];
+  }
 
   if (trainingAssertions) {
     type TrainingEntry = { use: string; c2pa_manifest: boolean | string };
     type TrainingMining = { data?: { entries?: TrainingEntry[] } };
-    const entry = (trainingAssertions as TrainingMining)?.data?.entries?.find((e: TrainingEntry) =>
+    
+    const rawEntries = (trainingAssertions as TrainingMining)?.data?.entries || (trainingAssertions as { entries?: unknown })?.entries;
+    const entriesList = Array.isArray(rawEntries)
+      ? rawEntries
+      : rawEntries && typeof rawEntries === 'object'
+        ? Object.values(rawEntries)
+        : [];
+
+    const entry = (entriesList as TrainingEntry[])?.find((e: TrainingEntry) =>
       e.use === 'notAllowed' && (e.c2pa_manifest === true || e.c2pa_manifest === 'true')
     );
 
@@ -18,8 +41,22 @@ export function selectDoNotTrain(manifest: Manifest): boolean {
 
   // Fallback: Check c2pa.actions for specific 'not_trained' markers
   type ActionsAssertion = { data?: { actions?: Array<{ action: string }> } };
-  const actionsAssertion = manifest.assertions?.['c2pa.actions'] as ActionsAssertion | undefined;
-  const actions = actionsAssertion?.data?.actions ?? [];
+  let actionsAssertion: unknown;
+
+  if (Array.isArray(assertions)) {
+    actionsAssertion = assertions.find(
+      (a): a is { label: string; data: unknown } =>
+        typeof a === 'object' &&
+        a !== null &&
+        'label' in a &&
+        typeof (a as Record<string, unknown>)['label'] === 'string' &&
+        (a as Record<string, unknown>)['label'] === 'c2pa.actions'
+    );
+  } else if (assertions && typeof assertions === 'object') {
+    actionsAssertion = (assertions as Record<string, unknown>)['c2pa.actions'];
+  }
+
+  const actions = (actionsAssertion as ActionsAssertion)?.data?.actions ?? [];
 
   return actions.some((a) => a.action === 'c2pa.not_trained');
 }
diff --git a/src/lib/selectors/editsAndActivity.ts b/src/lib/selectors/editsAndActivity.ts
index 862770d49..9496d8ab1 100644
--- a/src/lib/selectors/editsAndActivity.ts
+++ b/src/lib/selectors/editsAndActivity.ts
@@ -17,20 +17,31 @@ export async function selectEditsAndActivity(
   // Handle Legacy SDK (Map), Native SDK (Array), and crJSON (Object)
   type ActionItem = { label?: string; action: string };
   type ActionsAssertion = { data?: { actions?: ActionItem[] }; actions?: ActionItem[] };
-  let actionsAssertion: ActionsAssertion | undefined;
+  const assertions = manifest.assertions;
+  let actionsAssertion: unknown;
 
-  if (manifest.assertions instanceof Map) {
-    actionsAssertion = manifest.assertions.get('c2pa.actions.v2')?.[0] || manifest.assertions.get('c2pa.actions')?.[0] || manifest.assertions.get('c2pa.actions.v2') || manifest.assertions.get('c2pa.actions');
-  } else if (Array.isArray(manifest.assertions)) {
-    actionsAssertion = manifest.assertions.find((a: { label?: string }) => a.label === 'c2pa.actions' || a.label === 'c2pa.actions.v2');
-  } else {
-    actionsAssertion = manifest.assertions?.['c2pa.actions.v2'] || manifest.assertions?.['c2pa.actions'];
+  if (Array.isArray(assertions)) {
+    actionsAssertion = assertions.find(
+      (a): a is { label: string; data: unknown } =>
+        typeof a === 'object' &&
+        a !== null &&
+        'label' in a &&
+        typeof (a as Record<string, unknown>)['label'] === 'string' &&
+        ['c2pa.actions', 'c2pa.actions.v2'].includes((a as Record<string, unknown>)['label'] as string)
+    );
+  } else if (assertions && typeof assertions === 'object') {
+    actionsAssertion =
+      (assertions as Record<string, unknown>)['c2pa.actions.v2'] ||
+      (assertions as Record<string, unknown>)['c2pa.actions'];
   }
 
-  const actions = actionsAssertion?.data?.actions || actionsAssertion?.actions || [];
+  const actions =
+    (actionsAssertion as ActionsAssertion)?.data?.actions ||
+    (actionsAssertion as ActionsAssertion)?.actions ||
+    [];
 
   const uniqueActionTypes = new Set<string>();
-  actions.forEach((a) => uniqueActionTypes.add(a.action));
+  actions.forEach((a: ActionItem) => uniqueActionTypes.add(a.action));
 
   const results: TranslatedDictionaryCategory[] = [];
 
diff --git a/src/lib/selectors/generativeInfo.ts b/src/lib/selectors/generativeInfo.ts
index 12f65f1a0..baac0df8b 100644
--- a/src/lib/selectors/generativeInfo.ts
+++ b/src/lib/selectors/generativeInfo.ts
@@ -1,13 +1,15 @@
 // Copyright 2021-2024 Adobe, Copyright 2025 The C2PA Contributors
 
 import type {
-  DataType,
+  AssetType,
   Ingredient,
   Manifest,
 } from '@contentauth/c2pa-web';
 
+type GenSoftwareAgent = string | { name: string; version?: string };
+
 interface SdkGenerativeInfo {
-  softwareAgent: string;
+  softwareAgent: GenSoftwareAgent;
   type: string;
 }
 
@@ -15,7 +17,7 @@ type GenActionItem = {
   label?: string;
   action?: string;
   digitalSourceType?: string;
-  softwareAgent?: string;
+  softwareAgent?: GenSoftwareAgent;
   parameters?: { digitalSourceType?: string };
 };
 
@@ -23,10 +25,23 @@ type GenActionsAssertion = { data?: { actions?: GenActionItem[] } };
 
 function sdkSelectGenerativeInfo(manifest: Manifest): SdkGenerativeInfo[] {
   // Handle both native SDK array structures and crJSON maps
-  const isArray = Array.isArray(manifest.assertions);
-  const actionsAssertion = isArray
-    ? manifest.assertions.find((a: { label?: string }) => a.label === 'c2pa.actions' || a.label === 'c2pa.actions.v2')
-    : (manifest.assertions?.['c2pa.actions.v2'] || manifest.assertions?.['c2pa.actions']);
+  const assertions = manifest.assertions;
+  let actionsAssertion: unknown;
+
+  if (Array.isArray(assertions)) {
+    actionsAssertion = assertions.find(
+      (a): a is { label: string; data: unknown } =>
+        typeof a === 'object' &&
+        a !== null &&
+        'label' in a &&
+        typeof (a as Record<string, unknown>)['label'] === 'string' &&
+        ['c2pa.actions', 'c2pa.actions.v2'].includes((a as Record<string, unknown>)['label'] as string)
+    );
+  } else if (assertions && typeof assertions === 'object') {
+    actionsAssertion =
+      (assertions as Record<string, unknown>)['c2pa.actions.v2'] ||
+      (assertions as Record<string, unknown>)['c2pa.actions'];
+  }
 
   const actions = (actionsAssertion as GenActionsAssertion)?.data?.actions || [];
 
@@ -49,10 +64,9 @@ function sdkSelectGenerativeInfo(manifest: Manifest): SdkGenerativeInfo[] {
     });
 }
 
-import { filter, flow, uniqBy } from 'lodash/fp';
 import startsWith from 'lodash/startsWith';
 
-type SoftwareAgent = SdkGenerativeInfo['softwareAgent'];
+type SoftwareAgent = GenSoftwareAgent;
 
 export interface GenerativeInfo {
   softwareAgents: SoftwareAgent[];
@@ -62,21 +76,32 @@ export interface GenerativeInfo {
 
 export interface CustomModel {
   name: string;
-  dataTypes: DataType[];
+  dataTypes: AssetType[];
 }
 
 export function selectGenerativeSoftwareAgents(
   generativeInfo: SdkGenerativeInfo[],
 ): SoftwareAgent[] {
-  const softwareAgents: SoftwareAgent[] = generativeInfo.map((assertion) => {
+  const softwareAgents = generativeInfo.map((assertion) => {
     return assertion?.softwareAgent;
   });
 
-  // if there are undefined software agents remove them from the array
-  return flow<[SoftwareAgent[]], SoftwareAgent[], SoftwareAgent[]>(
-    filter((x) => !!x?.name || x),
-    uniqBy((x) => x?.name || x),
-  )(softwareAgents);
+  const valid = softwareAgents.filter((x): x is SoftwareAgent => {
+    if (x == null) return false;
+    if (typeof x === 'string') return !!x;
+
+    return !!x.name;
+  });
+
+  const seen = new Set<string>();
+
+  return valid.filter((x) => {
+    const key = typeof x === 'string' ? x : x.name;
+    if (seen.has(key)) return false;
+    seen.add(key);
+
+    return true;
+  });
 }
 
 export function selectGenerativeType(generativeInfo: SdkGenerativeInfo[]) {
@@ -91,10 +116,11 @@ export function selectGenerativeType(generativeInfo: SdkGenerativeInfo[]) {
 }
 
 export function selectModelsFromIngredient(ingredient: Ingredient) {
-  return (
-    ingredient.dataTypes?.filter((dataType: { type: string }) =>
-      startsWith('c2pa.types.model', dataType.type),
-    ) ?? []
+  const dataTypes = ingredient.data_types || (ingredient as { dataTypes?: AssetType[] }).dataTypes;
+  if (!dataTypes || !Array.isArray(dataTypes)) return [];
+
+  return dataTypes.filter((dataType: { type: string }) =>
+    startsWith('c2pa.types.model', dataType.type),
   );
 }
 
diff --git a/src/lib/selectors/producer.ts b/src/lib/selectors/producer.ts
index ec8f737cd..4d303fa47 100644
--- a/src/lib/selectors/producer.ts
+++ b/src/lib/selectors/producer.ts
@@ -11,8 +11,25 @@ type CreativeWorkAssertion = { data?: { author?: { name?: string; url?: string;
 type XmpAssertion = { data?: { 'dc:creator'?: string | string[] } };
 
 export function selectProducer(manifest: Manifest): ProducerInfo | null {
+  const assertions = manifest.assertions;
+
   // 1. Check CreativeWork schema
-  const creativeWork = (manifest.assertions?.['stds.schema-org.CreativeWork'] as CreativeWorkAssertion)?.data;
+  let creativeWorkAssertion: unknown;
+
+  if (Array.isArray(assertions)) {
+    creativeWorkAssertion = assertions.find(
+      (a): a is { label: string; data: unknown } =>
+        typeof a === 'object' &&
+        a !== null &&
+        'label' in a &&
+        typeof (a as Record<string, unknown>)['label'] === 'string' &&
+        (a as Record<string, unknown>)['label'] === 'stds.schema-org.CreativeWork'
+    );
+  } else if (assertions && typeof assertions === 'object') {
+    creativeWorkAssertion = (assertions as Record<string, unknown>)['stds.schema-org.CreativeWork'];
+  }
+
+  const creativeWork = (creativeWorkAssertion as CreativeWorkAssertion)?.data;
 
   if (creativeWork?.author) {
     const author = Array.isArray(creativeWork.author) ? creativeWork.author[0] : creativeWork.author;
@@ -23,7 +40,22 @@ export function selectProducer(manifest: Manifest): ProducerInfo | null {
   }
 
   // 2. Check XMP producer/creator
-  const xmp = (manifest.assertions?.['stds.xmp'] as XmpAssertion)?.data;
+  let xmpAssertion: unknown;
+
+  if (Array.isArray(assertions)) {
+    xmpAssertion = assertions.find(
+      (a): a is { label: string; data: unknown } =>
+        typeof a === 'object' &&
+        a !== null &&
+        'label' in a &&
+        typeof (a as Record<string, unknown>)['label'] === 'string' &&
+        (a as Record<string, unknown>)['label'] === 'stds.xmp'
+    );
+  } else if (assertions && typeof assertions === 'object') {
+    xmpAssertion = (assertions as Record<string, unknown>)['stds.xmp'];
+  }
+
+  const xmp = (xmpAssertion as XmpAssertion)?.data;
 
   if (xmp?.['dc:creator']) {
     const creator = Array.isArray(xmp['dc:creator']) ? xmp['dc:creator'][0] : xmp['dc:creator'];
diff --git a/src/lib/selectors/reviewRatings.ts b/src/lib/selectors/reviewRatings.ts
index b95d65cb3..e980abe40 100644
--- a/src/lib/selectors/reviewRatings.ts
+++ b/src/lib/selectors/reviewRatings.ts
@@ -14,8 +14,24 @@ export function selectReviewRatings(manifest: Manifest) {
     [],
   );
   type ActionsReviewAssertion = { data?: { metadata?: { reviewRatings?: ReviewRating[] } } };
+  const assertions = manifest.assertions;
+  let actionsAssertion: unknown;
+
+  if (Array.isArray(assertions)) {
+    actionsAssertion = assertions.find(
+      (a): a is { label: string; data: unknown } =>
+        typeof a === 'object' &&
+        a !== null &&
+        'label' in a &&
+        typeof (a as Record<string, unknown>)['label'] === 'string' &&
+        (a as Record<string, unknown>)['label'] === 'c2pa.actions'
+    );
+  } else if (assertions && typeof assertions === 'object') {
+    actionsAssertion = (assertions as Record<string, unknown>)['c2pa.actions'];
+  }
+
   const actionRatings =
-    (manifest.assertions?.['c2pa.actions'] as ActionsReviewAssertion)?.data?.metadata?.reviewRatings ?? [];
+    (actionsAssertion as ActionsReviewAssertion)?.data?.metadata?.reviewRatings ?? [];
   const reviewRatings = [...ingredientRatings, ...actionRatings];
 
   return {
diff --git a/src/lib/selectors/socialAccounts.ts b/src/lib/selectors/socialAccounts.ts
index b4ff40947..939b96d31 100644
--- a/src/lib/selectors/socialAccounts.ts
+++ b/src/lib/selectors/socialAccounts.ts
@@ -15,9 +15,11 @@ export function selectSocialAccounts(manifest: Manifest): SocialAccount[] {
   // Look through verified credentials if present
   const credentials = manifest.credentials || [];
   
+  type VcData = { id?: string; account?: { service?: string; identifier?: string } };
+
   for (const cred of credentials) {
     // Simplified mapping logic for standard social media VC schemas
-    const vcData = cred.credentialSubject || {};
+    const vcData = (cred as { credentialSubject?: VcData })?.credentialSubject || {};
 
     if (vcData?.account?.service && vcData?.account?.identifier) {
       accounts.push({
@@ -31,7 +33,23 @@ export function selectSocialAccounts(manifest: Manifest): SocialAccount[] {
 
   // Also check standard CreativeWork assertions for "sameAs" social URLs
   type CreativeWorkAssertion = { data?: { author?: { sameAs?: string | string[] } } };
-  const creativeWork = (manifest.assertions?.['stds.schema-org.CreativeWork'] as CreativeWorkAssertion)?.data;
+  const assertions = manifest.assertions;
+  let creativeWorkAssertion: unknown;
+
+  if (Array.isArray(assertions)) {
+    creativeWorkAssertion = assertions.find(
+      (a): a is { label: string; data: unknown } =>
+        typeof a === 'object' &&
+        a !== null &&
+        'label' in a &&
+        typeof (a as Record<string, unknown>)['label'] === 'string' &&
+        (a as Record<string, unknown>)['label'] === 'stds.schema-org.CreativeWork'
+    );
+  } else if (assertions && typeof assertions === 'object') {
+    creativeWorkAssertion = (assertions as Record<string, unknown>)['stds.schema-org.CreativeWork'];
+  }
+
+  const creativeWork = (creativeWorkAssertion as CreativeWorkAssertion)?.data;
 
   if (creativeWork?.author?.sameAs) {
     const urls = Array.isArray(creativeWork.author.sameAs) 
diff --git a/src/lib/selectors/validationResult.ts b/src/lib/selectors/validationResult.ts
index 25d69d80f..46c6641ec 100644
--- a/src/lib/selectors/validationResult.ts
+++ b/src/lib/selectors/validationResult.ts
@@ -1,11 +1,10 @@
 // Copyright 2021-2024 Adobe, Copyright 2025 The C2PA Contributors
 
-import type { ManifestStore } from '@contentauth/c2pa-web';
+import type { ValidationStatus as SdkValidationStatus, StatusCodes } from '@contentauth/c2pa-web';
 import { difference } from 'lodash';
 
-export type ValidationStatus = ManifestStore['validation_status'][0];
-export type ValidationResults =
-  ManifestStore['validation_results']['activeManifest'];
+export type ValidationStatus = SdkValidationStatus;
+export type ValidationResults = StatusCodes;
 export type ValidationStatusCode = 'valid' | 'invalid' | 'unrecognized';
 
 export type ValidationStatusResult = ReturnType<typeof selectValidationResult>;
diff --git a/src/lib/selectors/web3Info.ts b/src/lib/selectors/web3Info.ts
index 7527924a9..c7d6ce146 100644
--- a/src/lib/selectors/web3Info.ts
+++ b/src/lib/selectors/web3Info.ts
@@ -20,7 +20,23 @@ declare module '@contentauth/c2pa-web' {
 type CryptoAddressAssertion = { data?: Record<string, string[]> };
 
 export function selectWeb3(manifest: Manifest): [string, string[]][] {
-  const cryptoEntries = (manifest.assertions?.['adobe.crypto.addresses'] as CryptoAddressAssertion)?.data ?? {};
+  const assertions = manifest.assertions;
+  let cryptoAssertion: unknown;
+
+  if (Array.isArray(assertions)) {
+    cryptoAssertion = assertions.find(
+      (a): a is { label: string; data: unknown } =>
+        typeof a === 'object' &&
+        a !== null &&
+        'label' in a &&
+        typeof (a as Record<string, unknown>)['label'] === 'string' &&
+        (a as Record<string, unknown>)['label'] === 'adobe.crypto.addresses'
+    );
+  } else if (assertions && typeof assertions === 'object') {
+    cryptoAssertion = (assertions as Record<string, unknown>)['adobe.crypto.addresses'];
+  }
+
+  const cryptoEntries = (cryptoAssertion as CryptoAddressAssertion)?.data ?? {};
 
   return (Object.entries(cryptoEntries) as [string, string[]][]).filter(
     ([type, [address]]) => address && ['solana', 'ethereum'].includes(type),
diff --git a/src/lib/selectors/website.ts b/src/lib/selectors/website.ts
index 8119bee9e..d20aab885 100644
--- a/src/lib/selectors/website.ts
+++ b/src/lib/selectors/website.ts
@@ -21,9 +21,40 @@ type AssetRefAssertion = { data?: { references?: Array<{ reference?: { uri?: str
 type CreativeWorkAssertion = { data?: { url?: string } };
 
 export function selectWebsite(manifest: Manifest): string | null {
+  const assertions = manifest.assertions;
+  let assetRefAssertion: unknown;
+
+  if (Array.isArray(assertions)) {
+    assetRefAssertion = assertions.find(
+      (a): a is { label: string; data: unknown } =>
+        typeof a === 'object' &&
+        a !== null &&
+        'label' in a &&
+        typeof (a as Record<string, unknown>)['label'] === 'string' &&
+        (a as Record<string, unknown>)['label'] === 'c2pa.asset-ref'
+    );
+  } else if (assertions && typeof assertions === 'object') {
+    assetRefAssertion = (assertions as Record<string, unknown>)['c2pa.asset-ref'];
+  }
+
+  let creativeWorkAssertion: unknown;
+
+  if (Array.isArray(assertions)) {
+    creativeWorkAssertion = assertions.find(
+      (a): a is { label: string; data: unknown } =>
+        typeof a === 'object' &&
+        a !== null &&
+        'label' in a &&
+        typeof (a as Record<string, unknown>)['label'] === 'string' &&
+        (a as Record<string, unknown>)['label'] === 'stds.schema-org.CreativeWork'
+    );
+  } else if (assertions && typeof assertions === 'object') {
+    creativeWorkAssertion = (assertions as Record<string, unknown>)['stds.schema-org.CreativeWork'];
+  }
+
   const site =
-    (manifest.assertions?.['c2pa.asset-ref'] as AssetRefAssertion)?.data?.references?.[0]?.reference?.uri ??
-    (manifest.assertions?.['stds.schema-org.CreativeWork'] as CreativeWorkAssertion)?.data?.url;
+    (assetRefAssertion as AssetRefAssertion)?.data?.references?.[0]?.reference?.uri ??
+    (creativeWorkAssertion as CreativeWorkAssertion)?.data?.url;
 
   return site && isSecureUrl(site) ? site : null;
 }
diff --git a/src/routes/verify/components/AssetInfo/AssetInfoIssuerDate.svelte b/src/routes/verify/components/AssetInfo/AssetInfoIssuerDate.svelte
index d5423e628..6e0c70aa7 100644
--- a/src/routes/verify/components/AssetInfo/AssetInfoIssuerDate.svelte
+++ b/src/routes/verify/components/AssetInfo/AssetInfoIssuerDate.svelte
@@ -7,8 +7,10 @@
   import { _ } from 'svelte-i18n';
 
   export let manifestData: ManifestData | null;
-  export const trustSource: 'official' | 'legacy' | 'none' = 'none';
+  export let trustSource: 'official' | 'legacy' | 'none' = 'none';
   $: issuer = manifestData?.signatureInfo?.issuer;
 </script>
 
-<Description>{#if issuer}{$_('sidebar.verify.about.issuedby')} {issuer}{/if}</Description>
+<div data-trust-source={trustSource}>
+  <Description>{#if issuer}{$_('sidebar.verify.about.issuedby')} {issuer}{/if}</Description>
+</div>
diff --git a/src/routes/verify/components/DetailedInfo/AboutSection/AboutSection.svelte b/src/routes/verify/components/DetailedInfo/AboutSection/AboutSection.svelte
index de003cbf5..a3ba3b7d2 100644
--- a/src/routes/verify/components/DetailedInfo/AboutSection/AboutSection.svelte
+++ b/src/routes/verify/components/DetailedInfo/AboutSection/AboutSection.svelte
@@ -24,8 +24,8 @@
   <svelte:fragment slot="content">
     {#if manifestData.signatureInfo?.common_name || manifestData.signatureInfo?.issuer}
       <IssuedBySection 
-        commonName={manifestData.signatureInfo?.common_name} 
-        issuer={manifestData.signatureInfo?.issuer}
+        commonName={manifestData.signatureInfo?.common_name ?? undefined} 
+        issuer={manifestData.signatureInfo?.issuer ?? undefined}
         organizationalUnit={orgUnit}
         {country}
         {trustSource} 
diff --git a/src/routes/verify/stores/c2paReader.ts b/src/routes/verify/stores/c2paReader.ts
index 040fad77f..8180b0d99 100644
--- a/src/routes/verify/stores/c2paReader.ts
+++ b/src/routes/verify/stores/c2paReader.ts
@@ -21,7 +21,7 @@ export type SourceState = Loadable<SourceData>;
 export type ReadableSource = Readable<SourceState>;
 
 export interface C2paReaderStore extends Readable<SourceState> {
-  read: (source: Blob | File) => Promise<void>;
+  read: (source: Blob | File | string) => Promise<void>;
   clear: () => void;
 }
 
@@ -45,11 +45,16 @@ export function createC2paReader(): C2paReaderStore {
 
   return {
     subscribe,
-    read: async (source: Blob | File) => {
+    read: async (source: Blob | File | string) => {
       set({ state: 'loading' });
       dispose?.();
 
       try {
+        if (typeof source === 'string') {
+          const response = await fetch(source);
+          source = await response.blob();
+        }
+
         const sdk = await getSdk();
         const sourceType = source instanceof Blob ? source.type : '';
         const normalizedSourceType = sourceType.toLowerCase().trim();
@@ -109,98 +114,101 @@ export function createC2paReader(): C2paReaderStore {
         if (needsLegacyPass) {
           const legacySettings = await getLegacyToolkitSettings();
           const legacyReader = await sdk.reader.fromBlob(source.type || 'application/octet-stream', source, legacySettings);
-          const legacyStore = await legacyReader.manifestStore();
-
-          // 3. ONLY ADOPT Pass 2 if it actually solved the problem (State is now Trusted/Valid)
-          if (legacyStore.validation_state === 'Trusted' || legacyStore.validation_state === 'Valid') {
-            finalStore = legacyStore;
-            
-            reader.free();
-            currentReader = legacyReader;
-
-            const isTrustError = (s: ValidationStatus) => s.code.includes('signingCredential.untrusted') || s.code.includes('signingCredential.invalid');
-
-            // 4a. Tag the Active Manifest
-            const p1ActiveV3 = (rawManifestStore.validation_results?.activeManifest?.failure || []) as ValidationStatus[];
-            const p1ActiveV2 = (rawManifestStore.manifests?.[rawManifestStore.active_manifest || '']?.validation_status || []) as ValidationStatus[];
-            const wasActiveUntrusted = p1ActiveV3.some(isTrustError) || p1ActiveV2.some(isTrustError);
-            const isFinalTrusted = finalStore.validation_state === 'Trusted';
-            
-            if (finalStore.manifests && finalStore.active_manifest && finalStore.manifests[finalStore.active_manifest]) {
-              const activeMan = finalStore.manifests[finalStore.active_manifest] as unknown as TrustedManifest;
-
-              // If the root is Trusted, default to official, then downgrade if Pass 1 failed.
-              if (isFinalTrusted) {
-                activeMan.trust_source = wasActiveUntrusted ? 'legacy' : 'official';
-              } else {
-                activeMan.trust_source = 'none';
+          
+          if (legacyReader) {
+            const legacyStore = await legacyReader.manifestStore();
+
+            // 3. ONLY ADOPT Pass 2 if it actually solved the problem (State is now Trusted/Valid)
+            if (legacyStore.validation_state === 'Trusted' || legacyStore.validation_state === 'Valid') {
+              finalStore = legacyStore;
+              
+              reader.free();
+              currentReader = legacyReader;
+
+              const isTrustError = (s: ValidationStatus) => s.code.includes('signingCredential.untrusted') || s.code.includes('signingCredential.invalid');
+
+              // 4a. Tag the Active Manifest
+              const p1ActiveV3 = (rawManifestStore.validation_results?.activeManifest?.failure || []) as ValidationStatus[];
+              const p1ActiveV2 = (rawManifestStore.manifests?.[rawManifestStore.active_manifest || '']?.validation_status || []) as ValidationStatus[];
+              const wasActiveUntrusted = p1ActiveV3.some(isTrustError) || p1ActiveV2.some(isTrustError);
+              const isFinalTrusted = finalStore.validation_state === 'Trusted';
+              
+              if (finalStore.manifests && finalStore.active_manifest && finalStore.manifests[finalStore.active_manifest]) {
+                const activeMan = finalStore.manifests[finalStore.active_manifest] as unknown as TrustedManifest;
+
+                // If the root is Trusted, default to official, then downgrade if Pass 1 failed.
+                if (isFinalTrusted) {
+                  activeMan.trust_source = wasActiveUntrusted ? 'legacy' : 'official';
+                } else {
+                  activeMan.trust_source = 'none';
+                }
               }
-            }
 
-            // 4b. Tag ALL Ingredients across the entire provenance tree
-            const p1Deltas = (rawManifestStore.validation_results?.ingredientDeltas || []) as ValidationDelta[];
-
-            (Object.entries(finalStore.manifests || {}) as Array<[string, TrustedManifest]>).forEach(([label, manifest]) => {
-              const p1Manifest = rawManifestStore.manifests?.[label];
-
-              if (manifest.ingredients && p1Manifest?.ingredients) {
-                manifest.ingredients.forEach((ingredient, index) => {
-                  // ZERO TRUST DEFAULT: Unverified assets get no trust credentials
-                  ingredient.trust_source = 'none';
-
-                  if (ingredient.active_manifest) {
-                    const p1Ing = p1Manifest.ingredients?.[index];
-                    const subLabel = ingredient.active_manifest;
-                    const p1SubManifest = subLabel ? rawManifestStore.manifests?.[subLabel] : null;
-
-                    // 1. Check the Ingredient Pointer (V2 standard)
-                    const p1V2_ing = (p1Ing?.validation_status || []) as ValidationStatus[];
-
-                    // 2. Check the actual Sub-Manifest directly (V2 + V3 standards)
-                    // NOTE: In V3, the sub-manifest's own results are stored under .activeManifest
-                    const p1V2_sub = (p1SubManifest?.validation_status || []) as ValidationStatus[];
-                    const p1V3_sub = (p1SubManifest?.validation_results?.activeManifest?.failure || []) as ValidationStatus[];
-
-                    // 3. Check the Root Deltas (V3 standard)
-                    const p1Delta = p1Deltas.find((d) =>
-                      d.ingredientAssertionURI?.includes(label) &&
-                      d.ingredientAssertionURI?.includes('c2pa.ingredient')
-                    );
-                    const p1V3_delta = p1Delta?.validationDeltas?.failure || [];
-
-                    // AGGREGATE: Did ANY layer in the sub-manifest chain fail Trust in Pass 1?
-                    const hasTrustError = 
-                      p1V3_delta.some(isTrustError) || 
-                      p1V2_ing.some(isTrustError) || 
-                      p1V2_sub.some(isTrustError) || 
-                      p1V3_sub.some(isTrustError);
-
-                    if (isFinalTrusted) {
-                      // If the Root is trusted, the chain is intact. 
-                      // It only earns 'Official' if it explicitly cleared the local error gauntlet.
-                      ingredient.trust_source = hasTrustError ? 'legacy' : 'official';
+              // 4b. Tag ALL Ingredients across the entire provenance tree
+              const p1Deltas = (rawManifestStore.validation_results?.ingredientDeltas || []) as ValidationDelta[];
+
+              (Object.entries(finalStore.manifests || {}) as Array<[string, TrustedManifest]>).forEach(([label, manifest]) => {
+                const p1Manifest = rawManifestStore.manifests?.[label];
+
+                if (manifest.ingredients && p1Manifest?.ingredients) {
+                  manifest.ingredients.forEach((ingredient, index) => {
+                    // ZERO TRUST DEFAULT: Unverified assets get no trust credentials
+                    ingredient.trust_source = 'none';
+
+                    if (ingredient.active_manifest) {
+                      const p1Ing = p1Manifest.ingredients?.[index];
+                      const subLabel = ingredient.active_manifest;
+                      const p1SubManifest = (subLabel ? rawManifestStore.manifests?.[subLabel] : null) as Record<string, unknown> | null;
+
+                      // 1. Check the Ingredient Pointer (V2 standard)
+                      const p1V2_ing = (p1Ing?.validation_status || []) as ValidationStatus[];
+
+                      // 2. Check the actual Sub-Manifest directly (V2 + V3 standards)
+                      // NOTE: In V3, the sub-manifest's own results are stored under .activeManifest
+                      const p1V2_sub = (p1SubManifest?.validation_status || []) as ValidationStatus[];
+                      const p1V3_sub = ((p1SubManifest?.validation_results as Record<string, unknown> | undefined)?.activeManifest as Record<string, unknown> | undefined)?.failure as ValidationStatus[] | undefined || [];
+
+                      // 3. Check the Root Deltas (V3 standard)
+                      const p1Delta = p1Deltas.find((d) =>
+                        d.ingredientAssertionURI?.includes(label) &&
+                        d.ingredientAssertionURI?.includes('c2pa.ingredient')
+                      );
+                      const p1V3_delta = p1Delta?.validationDeltas?.failure || [];
+
+                      // AGGREGATE: Did ANY layer in the sub-manifest chain fail Trust in Pass 1?
+                      const hasTrustError = 
+                        p1V3_delta.some(isTrustError) || 
+                        p1V2_ing.some(isTrustError) || 
+                        p1V2_sub.some(isTrustError) || 
+                        p1V3_sub.some(isTrustError);
+
+                      if (isFinalTrusted) {
+                        // If the Root is trusted, the chain is intact. 
+                        // It only earns 'Official' if it explicitly cleared the local error gauntlet.
+                        ingredient.trust_source = hasTrustError ? 'legacy' : 'official';
+                      }
                     }
-                  }
-                });
-              }
-            });
-
-          } else {
-            legacyReader.free();
-            
-            // Fallback: If root is Trusted, entire tree is official.
-            const isTrusted = finalStore.validation_state === 'Trusted';
-            (Object.entries(finalStore.manifests || {}) as Array<[string, TrustedManifest]>).forEach(([label, manifest]) => {
-              if (label === finalStore.active_manifest) {
-                manifest.trust_source = isTrusted ? 'official' : 'none';
-              }
+                  });
+                }
+              });
 
-              if (manifest.ingredients) {
-                manifest.ingredients.forEach((ing) => {
-                  ing.trust_source = (isTrusted && ing.active_manifest) ? 'official' : 'none';
-                });
-              }
-            });
+            } else {
+              legacyReader.free();
+              
+              // Fallback: If root is Trusted, entire tree is official.
+              const isTrusted = finalStore.validation_state === 'Trusted';
+              (Object.entries(finalStore.manifests || {}) as Array<[string, TrustedManifest]>).forEach(([label, manifest]) => {
+                if (label === finalStore.active_manifest) {
+                  manifest.trust_source = isTrusted ? 'official' : 'none';
+                }
+
+                if (manifest.ingredients) {
+                  manifest.ingredients.forEach((ing) => {
+                    ing.trust_source = (isTrusted && ing.active_manifest) ? 'official' : 'none';
+                  });
+                }
+              });
+            }
           }
         } else {
           // Pass 1 had no trust issues (Could be Trusted or Hard Invalid)
@@ -239,6 +247,7 @@ export function createC2paReader(): C2paReaderStore {
           toast.trigger(unsupportedFileType());
         } else if (
           (errName === 'C2pa(PrereleaseError)' || errStr.includes('Prerelease')) &&
+          typeof source !== 'string' &&
           (await hasLegacyCredentials(source))
         ) {
           openModal(LegacyCredentialModal);
diff --git a/vite.config.js b/vite.config.js
index 5a29118a2..ed52a5904 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -18,6 +18,11 @@ const config = {
       allow: ['assets', 'locales'],
     },
   },
+  resolve: {
+    alias: {
+      'intl-messageformat': path.resolve(__dirname, 'node_modules/intl-messageformat/intl-messageformat.esm.js'),
+    },
+  },
   build: {
     minify: 'terser',
     sourcemap: true,
@@ -29,7 +34,7 @@ const config = {
     },
   },
   ssr: {
-    noExternal: ['svelte-i18n'],
+    noExternal: ['svelte-i18n', 'intl-messageformat'],
   },
   define: {
     __SUPPORTED_LOCALES__: JSON.stringify(getSupportedLocales()),