From 2688995e6f72bead42a1590a499439d569a7be3a Mon Sep 17 00:00:00 2001 From: Mohammed-Mamoun98 Date: Tue, 3 Dec 2024 12:04:56 +0200 Subject: [PATCH 1/5] remove credentials V1 fallbacks --- .../routes/dashboard/credentials/index.tsx | 13 ++++------ examples/idos-example-dapp/src/main.js | 25 +------------------ examples/issuer-sdk-demo/src/app/page.tsx | 13 ++++------ 3 files changed, 11 insertions(+), 40 deletions(-) diff --git a/apps/idos-data-dashboard/src/routes/dashboard/credentials/index.tsx b/apps/idos-data-dashboard/src/routes/dashboard/credentials/index.tsx index e13f214df..c1abdca22 100644 --- a/apps/idos-data-dashboard/src/routes/dashboard/credentials/index.tsx +++ b/apps/idos-data-dashboard/src/routes/dashboard/credentials/index.tsx @@ -42,17 +42,14 @@ const useFetchCredentials = () => { .filter((credential) => !credential.original_id) .map((credential) => { - const { credential_level, credential_status, credential_type, issuer } = - // biome-ignore lint/suspicious/noExplicitAny: // @todo: remove once we have successfully migrated to Credentials 2.0. - credential as any; const fields = credential.public_notes ? JSON.parse(credential.public_notes) : {}; const public_notes = { - id: fields.id ?? credential.id, - level: fields.level ?? credential_level, - status: fields.status ?? credential_status, - type: fields.type ?? credential_type, - issuer: fields.issuer ?? issuer, + id: fields.id, + level: fields.level, + status: fields.status, + type: fields.type, + issuer: fields.issuer, }; return { diff --git a/examples/idos-example-dapp/src/main.js b/examples/idos-example-dapp/src/main.js index eeca74685..d0ddc5e3e 100644 --- a/examples/idos-example-dapp/src/main.js +++ b/examples/idos-example-dapp/src/main.js @@ -200,30 +200,7 @@ const connectWallet = { let credentials = await terminal .h1("eyes", "User's credentials") .wait("awaiting signature", cache.get("credentials") || idos.data.list("credentials")); - credentials = credentials - .filter((c) => c.original_id === null) - // @todo: remove once we have successfully migrated to Credentials 2.0. - .map((credential) => { - const { credential_level, credential_status, credential_type, issuer } = credential; - const _fields = credential.public_notes - ? typeof credential.public_notes === "string" - ? JSON.parse(credential.public_notes) - : credential.public_notes - : {}; - const { id, ...public_notes } = { - id: _fields.id ?? credential.id, - level: _fields.level ?? credential_level, - status: _fields.status ?? credential_status, - type: _fields.type ?? credential_type, - issuer: _fields.issuer ?? issuer, - }; - - return { - ...credential, - ...public_notes, - public_notes, - }; - }); + credentials = credentials.filter((c) => c.original_id === null); cache.set("credentials", credentials); diff --git a/examples/issuer-sdk-demo/src/app/page.tsx b/examples/issuer-sdk-demo/src/app/page.tsx index 48311b50c..342f0f968 100644 --- a/examples/issuer-sdk-demo/src/app/page.tsx +++ b/examples/issuer-sdk-demo/src/app/page.tsx @@ -60,17 +60,14 @@ export default function Home() { const _credentials = await _instance.data.list("credentials"); setCredentials( _credentials.map((credential) => { - const { credential_level, credential_status, credential_type, issuer } = - // biome-ignore lint/suspicious/noExplicitAny: // @todo: remove once we have successfully migrated to Credentials 2.0. - credential as any; const fields = credential.public_notes ? JSON.parse(credential.public_notes) : {}; const public_notes = { - id: fields.id ?? credential.id, - level: fields.level ?? credential_level, - status: fields.status ?? credential_status, - type: fields.type ?? credential_type, - issuer: fields.issuer ?? issuer, + id: fields.id, + level: fields.level, + status: fields.status, + type: fields.type, + issuer: fields.issuer, }; return { ...credential, From 05835ba31720ccbf2b3d5accf299bc657c03c2ff Mon Sep 17 00:00:00 2001 From: Mohammed-Mamoun98 Date: Tue, 3 Dec 2024 12:09:18 +0200 Subject: [PATCH 2/5] remove expect error comments --- apps/idos-data-dashboard/src/core/wagmi.ts | 3 --- apps/idos-data-dashboard/src/main.tsx | 1 - 2 files changed, 4 deletions(-) diff --git a/apps/idos-data-dashboard/src/core/wagmi.ts b/apps/idos-data-dashboard/src/core/wagmi.ts index 1a00a03bd..0a0a14623 100644 --- a/apps/idos-data-dashboard/src/core/wagmi.ts +++ b/apps/idos-data-dashboard/src/core/wagmi.ts @@ -17,14 +17,11 @@ const metadata = { export const chains = [mainnet, sepolia] as const; export const wagmiConfig = defaultWagmiConfig({ - // @ts-expect-error - wagmi types are outdated chains, projectId, metadata, transports: { - // @ts-expect-error - wagmi types are outdated [mainnet.id]: http(), - // @ts-expect-error - wagmi types are outdated [sepolia.id]: http(), }, }); diff --git a/apps/idos-data-dashboard/src/main.tsx b/apps/idos-data-dashboard/src/main.tsx index e3989cf68..243be379a 100644 --- a/apps/idos-data-dashboard/src/main.tsx +++ b/apps/idos-data-dashboard/src/main.tsx @@ -29,7 +29,6 @@ ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render( - {/* @ts-expect-error: TODO: fix wagmi types */} From 933c99ee424794144835632ac29417c241238878 Mon Sep 17 00:00:00 2001 From: Mohammed-Mamoun98 Date: Tue, 3 Dec 2024 12:45:11 +0200 Subject: [PATCH 3/5] preback expecte error comment --- apps/idos-data-dashboard/src/core/wagmi.ts | 3 +++ apps/idos-data-dashboard/src/main.tsx | 1 + 2 files changed, 4 insertions(+) diff --git a/apps/idos-data-dashboard/src/core/wagmi.ts b/apps/idos-data-dashboard/src/core/wagmi.ts index 0a0a14623..1a00a03bd 100644 --- a/apps/idos-data-dashboard/src/core/wagmi.ts +++ b/apps/idos-data-dashboard/src/core/wagmi.ts @@ -17,11 +17,14 @@ const metadata = { export const chains = [mainnet, sepolia] as const; export const wagmiConfig = defaultWagmiConfig({ + // @ts-expect-error - wagmi types are outdated chains, projectId, metadata, transports: { + // @ts-expect-error - wagmi types are outdated [mainnet.id]: http(), + // @ts-expect-error - wagmi types are outdated [sepolia.id]: http(), }, }); diff --git a/apps/idos-data-dashboard/src/main.tsx b/apps/idos-data-dashboard/src/main.tsx index 243be379a..bc8f60a03 100644 --- a/apps/idos-data-dashboard/src/main.tsx +++ b/apps/idos-data-dashboard/src/main.tsx @@ -29,6 +29,7 @@ ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render( + {/* @ts-ignore: TODO: fix wagmi types */} From 7056b334779cf173ed77dcab4a8a92697f790702 Mon Sep 17 00:00:00 2001 From: Mohammed-Mamoun98 Date: Tue, 3 Dec 2024 15:40:22 +0200 Subject: [PATCH 4/5] remove unnecssary public notes spreading --- .../src/routes/dashboard/credentials/index.tsx | 17 ----------------- examples/issuer-sdk-demo/src/app/page.tsx | 18 +----------------- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/apps/idos-data-dashboard/src/routes/dashboard/credentials/index.tsx b/apps/idos-data-dashboard/src/routes/dashboard/credentials/index.tsx index c1abdca22..c540788ca 100644 --- a/apps/idos-data-dashboard/src/routes/dashboard/credentials/index.tsx +++ b/apps/idos-data-dashboard/src/routes/dashboard/credentials/index.tsx @@ -40,23 +40,6 @@ const useFetchCredentials = () => { select: (credentials) => credentials .filter((credential) => !credential.original_id) - - .map((credential) => { - const fields = credential.public_notes ? JSON.parse(credential.public_notes) : {}; - - const public_notes = { - id: fields.id, - level: fields.level, - status: fields.status, - type: fields.type, - issuer: fields.issuer, - }; - - return { - ...credential, - public_notes: JSON.stringify(public_notes), - }; - }), }); }; diff --git a/examples/issuer-sdk-demo/src/app/page.tsx b/examples/issuer-sdk-demo/src/app/page.tsx index 342f0f968..fd23e4609 100644 --- a/examples/issuer-sdk-demo/src/app/page.tsx +++ b/examples/issuer-sdk-demo/src/app/page.tsx @@ -58,23 +58,7 @@ export default function Home() { // @ts-expect-error: types in the SDK are a bit messy. await _instance.setSigner("EVM", signer); const _credentials = await _instance.data.list("credentials"); - setCredentials( - _credentials.map((credential) => { - const fields = credential.public_notes ? JSON.parse(credential.public_notes) : {}; - - const public_notes = { - id: fields.id, - level: fields.level, - status: fields.status, - type: fields.type, - issuer: fields.issuer, - }; - return { - ...credential, - public_notes: JSON.stringify(public_notes), - }; - }), - ); + setCredentials(_credentials); } setHasProfile(_hasProfile); From 77c54caf0d6a2922ff3007fd8a861059d628a7e6 Mon Sep 17 00:00:00 2001 From: Mohammed-Mamoun98 Date: Tue, 3 Dec 2024 15:44:04 +0200 Subject: [PATCH 5/5] format fix --- .../src/routes/dashboard/credentials/index.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/idos-data-dashboard/src/routes/dashboard/credentials/index.tsx b/apps/idos-data-dashboard/src/routes/dashboard/credentials/index.tsx index c540788ca..ecbd53400 100644 --- a/apps/idos-data-dashboard/src/routes/dashboard/credentials/index.tsx +++ b/apps/idos-data-dashboard/src/routes/dashboard/credentials/index.tsx @@ -37,9 +37,7 @@ const useFetchCredentials = () => { .map((c) => c.id), })) as idOSCredentialWithShares[]; // @todo: remove once we have more type safety in the SDK. }, - select: (credentials) => - credentials - .filter((credential) => !credential.original_id) + select: (credentials) => credentials.filter((credential) => !credential.original_id), }); };