blockchain-lab-um · martines3000 · Oct 23, 2023 · Oct 16, 2023 · Oct 18, 2023 · Oct 18, 2023
diff --git a/.changeset/hungry-crabs-end.md b/.changeset/hungry-crabs-end.md
@@ -0,0 +1,5 @@
+---
+'@blockchain-lab-um/dapp': patch
+---
+
+Fixes issue with importing Polygon ID credentials.
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -18,9 +18,13 @@
     "@blockchain-lab-um/masca-types": "1.2.0"
   },
   "changesets": [
+    "hungry-crabs-end",
     "late-geckos-retire",
     "modern-grapes-buy",
     "purple-jokes-hunt",
-    "weak-frogs-occur"
+    "shy-seals-remember",
+    "tasty-eels-relax",
+    "weak-frogs-occur",
+    "wicked-socks-play"
   ]
-}
+}
diff --git a/.changeset/shy-seals-remember.md b/.changeset/shy-seals-remember.md
@@ -0,0 +1,5 @@
+---
+'@blockchain-lab-um/did-provider-ebsi': patch
+---
+
+Correctly sets the privateKeyHex.
diff --git a/.changeset/tasty-eels-relax.md b/.changeset/tasty-eels-relax.md
@@ -0,0 +1,5 @@
+---
+'@blockchain-lab-um/masca': patch
+---
+
+Updates snap shasum.
diff --git a/.changeset/wicked-socks-play.md b/.changeset/wicked-socks-play.md
@@ -0,0 +1,5 @@
+---
+'@blockchain-lab-um/masca-connector': patch
+---
+
+Adds build for UMD.
diff --git a/libs/did-provider-ebsi/CHANGELOG.md b/libs/did-provider-ebsi/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.2.1-beta.0
+
+### Patch Changes
+
+- [#508](https://github.com/blockchain-lab-um/masca/pull/508) [`60c0e6e`](https://github.com/blockchain-lab-um/masca/commit/60c0e6eac0e09c199c9471de292cfb1426650ed7) Thanks [@pseudobun](https://github.com/pseudobun)! - Correctly sets the privateKeyHex.
+
 ## 1.2.0
 
 ### Minor Changes

diff --git a/libs/did-provider-ebsi/package.json b/libs/did-provider-ebsi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@blockchain-lab-um/did-provider-ebsi",
-  "version": "1.2.0",
+  "version": "1.2.1-beta.0",
   "private": false,
   "description": "Veramo plugin that can enable creation and control of EBSI DIDs",
   "keywords": [],

diff --git a/libs/did-provider-ebsi/src/ebsiDidProvider.ts b/libs/did-provider-ebsi/src/ebsiDidProvider.ts
@@ -202,6 +202,7 @@ export class EbsiDIDProvider extends AbstractIdentifierProvider {
         y,
       };
       privateKeyJwk = { ...publicKeyJwk, d };
+      privateKeyHex = args.privateKeyHex;
 
       jwkThumbprint = await jose.calculateJwkThumbprint(
         privateKeyJwk,

diff --git a/package.json b/package.json
@@ -58,7 +58,7 @@
     "@typescript-eslint/parser": "^6.3.0",
     "concurrently": "^8.2.0",
     "cross-env": "^7.0.3",
-    "eslint": "^8.46.0",
+    "eslint": "^8.51.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-airbnb-typescript": "17.1.0",
     "eslint-config-prettier": "^9.0.0",

diff --git a/packages/connector/.gitignore b/packages/connector/.gitignore
@@ -0,0 +1 @@
+bundle/
diff --git a/packages/connector/CHANGELOG.md b/packages/connector/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.2.1-beta.0
+
+### Patch Changes
+
+- [#504](https://github.com/blockchain-lab-um/masca/pull/504) [`54efbd0`](https://github.com/blockchain-lab-um/masca/commit/54efbd0f7777a172e879228a6da134c6cc0b3b33) Thanks [@pseudobun](https://github.com/pseudobun)! - Adds build for UMD.
+
 ## 1.2.0
 
 ### Minor Changes

diff --git a/packages/connector/package.json b/packages/connector/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@blockchain-lab-um/masca-connector",
-  "version": "1.2.0",
+  "version": "1.2.1-beta.0",
   "description": "Library for using Masca on the frontend",
   "keywords": [
     "MetaMask",
@@ -32,6 +32,7 @@
   ],
   "scripts": {
     "build": "pnpm clean && pnpm compile",
+    "bundle": "webpack",
     "clean": "rimraf dist",
     "compile": "tsup",
     "lint": "pnpm lint:eslint && pnpm lint:prettier",
@@ -50,7 +51,9 @@
     "eip-712-types-generation": "^0.1.6"
   },
   "devDependencies": {
-    "tsup": "^7.2.0"
+    "esbuild-loader": "^4.0.2",
+    "tsup": "^7.2.0",
+    "webpack-cli": "^5.1.4"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/connector/webpack.config.mjs b/packages/connector/webpack.config.mjs
@@ -0,0 +1,38 @@
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+// eslint-disable-next-line @typescript-eslint/naming-convention
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+export default {
+  entry: './src/index.ts',
+  module: {
+    rules: [
+      {
+        test: /\.[jt]sx?$/,
+        loader: 'esbuild-loader',
+        exclude: /node_modules/,
+        options: {
+          tsconfig: './tsconfig.json',
+          loader: 'ts',
+          target: 'es2020',
+        },
+      },
+    ],
+  },
+  resolve: {
+    extensions: ['.tsx', '.ts', '.js'],
+    extensionAlias: {
+      '.js': ['.js', '.ts'],
+    },
+  },
+  output: {
+    filename: 'bundle.js',
+    path: path.resolve(__dirname, 'bundle'),
+    globalObject: 'this',
+    library: {
+      name: 'webpackNumbers',
+      type: 'umd',
+    },
+  },
+};
diff --git a/packages/dapp/CHANGELOG.md b/packages/dapp/CHANGELOG.md
@@ -1,5 +1,18 @@
 # @blockchain-lab-um/dapp
 
+## 1.1.1-beta.1
+
+### Patch Changes
+
+- [#507](https://github.com/blockchain-lab-um/masca/pull/507) [`0f322c5`](https://github.com/blockchain-lab-um/masca/commit/0f322c5b4eb3884cf7ea2363860db053332b4649) Thanks [@martines3000](https://github.com/martines3000)! - Fixes issue with importing Polygon ID credentials.
+
+## 1.1.1-beta.0
+
+### Patch Changes
+
+- Updated dependencies [[`54efbd0`](https://github.com/blockchain-lab-um/masca/commit/54efbd0f7777a172e879228a6da134c6cc0b3b33)]:
+  - @blockchain-lab-um/masca-connector@1.2.1-beta.0
+
 ## 1.1.0
 
 ### Minor Changes

diff --git a/packages/dapp/package.json b/packages/dapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@blockchain-lab-um/dapp",
-  "version": "1.1.0",
+  "version": "1.1.1-beta.1",
   "private": true,
   "license": "(Apache-2.0 AND MIT)",
   "type": "commonjs",
@@ -20,7 +20,7 @@
     "start": "next start"
   },
   "dependencies": {
-    "@blockchain-lab-um/masca-connector": "1.2.0",
+    "@blockchain-lab-um/masca-connector": "1.2.1-beta.0",
     "@blockchain-lab-um/oidc-types": "0.0.8",
     "@headlessui/react": "^1.7.17",
     "@heroicons/react": "^2.0.18",
@@ -62,7 +62,7 @@
     "@types/react-dom": "18.2.7",
     "autoprefixer": "^10.4.15",
     "eslint-config-next": "^13.5.1",
-    "postcss": "^8.4.30",
+    "postcss": "^8.4.31",
     "prisma": "^5.3.1",
     "sass": "^1.67.0",
     "stylelint": "^15.10.3",

diff --git a/packages/dapp/src/components/Controlbar/Controlbar.tsx b/packages/dapp/src/components/Controlbar/Controlbar.tsx
@@ -99,7 +99,15 @@ const Controlbar = () => {
     });
 
     if (isError(res)) {
-      console.log('error', res);
+      setTimeout(() => {
+        useToastStore.setState({
+          open: true,
+          title: res.error,
+          type: 'error',
+          loading: false,
+          link: null,
+        });
+      }, 200);
       return false;
     }
 
@@ -112,14 +120,27 @@ const Controlbar = () => {
         } as QueryCredentialsRequestResult;
         newVcs.push(finalVC);
       });
-      changeVcs(
-        [...vcs, ...newVcs].map((modifyVC) =>
-          stringifyCredentialSubject(modifyVC)
-        )
-      );
 
+      setTimeout(() => {
+        useToastStore.setState({
+          open: true,
+          title: t('save-success'),
+          type: 'success',
+          loading: false,
+          link: null,
+        });
+      }, 200);
       const queryResult = await api.queryCredentials();
       if (isError(queryResult)) {
+        setTimeout(() => {
+          useToastStore.setState({
+            open: true,
+            title: t('query-error'),
+            type: 'error',
+            loading: false,
+            link: null,
+          });
+        }, 200);
         return false;
       }
 

diff --git a/packages/dapp/src/components/ImportModal/index.tsx b/packages/dapp/src/components/ImportModal/index.tsx
@@ -1,6 +1,7 @@
 import { useState } from 'react';
 import {
-  isVerifiableCredential,
+  isW3CCredential,
+  isW3CVerifiableCredential,
   type AvailableCredentialStores,
 } from '@blockchain-lab-um/masca-connector';
 import { Dialog } from '@headlessui/react';
@@ -41,10 +42,9 @@ function ImportModal({ isOpen, setOpen, importVC }: ImportModalProps) {
 
   const validateAndImportCredential = async (): Promise<void> => {
     setLoading(true);
-
-    let vcObj: W3CVerifiableCredential;
+    let vcObj: any;
     try {
-      vcObj = JSON.parse(vc) as W3CVerifiableCredential;
+      vcObj = JSON.parse(vc);
     } catch (err) {
       try {
         vcObj = normalizeCredential(vc) as W3CVerifiableCredential;
@@ -64,7 +64,7 @@ function ImportModal({ isOpen, setOpen, importVC }: ImportModalProps) {
       }
     }
 
-    if (!isVerifiableCredential(vcObj)) {
+    if (!isW3CVerifiableCredential(vcObj) && !isW3CCredential(vcObj)) {
       setTimeout(() => {
         useToastStore.setState({
           open: true,

diff --git a/packages/dapp/src/messages/en.json b/packages/dapp/src/messages/en.json
@@ -103,7 +103,9 @@
     "query": "Querying credentials",
     "query-error": "Failed to query credentials",
     "query-success": "Successfully queried credentials",
-    "save-error": "Failed to save credential. VC was invalid"
+    "save-error": "Failed to save credential. VC was invalid",
+    "save-error-title": "Failed to save credential",
+    "save-success": "Successfully saved credential"
   },
   "CreateConnectionModal": {
     "desc": " Scan this QR code with your mobile device to create a connection to this page.",

diff --git a/packages/docs/package.json b/packages/docs/package.json
@@ -40,18 +40,18 @@
     "@emotion/styled": "^11.11.0",
     "@mdx-js/react": "1.6.22",
     "clsx": "^2.0.0",
-    "prism-react-renderer": "^2.0.6",
+    "prism-react-renderer": "^2.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@docusaurus/module-type-aliases": "^2.4.1",
-    "@docusaurus/plugin-content-docs": "^2.4.1",
-    "@docusaurus/types": "^2.4.1",
+    "@docusaurus/module-type-aliases": "^2.4.3",
+    "@docusaurus/plugin-content-docs": "^2.4.3",
+    "@docusaurus/types": "^2.4.3",
     "@tsconfig/docusaurus": "^1.0.7",
     "@types/react": "18.2.19",
     "precompress": "^11.2.2",
-    "stylelint": "^15.10.2",
+    "stylelint": "^15.11.0",
     "stylelint-config-css-modules": "^4.3.0",
     "stylelint-config-prettier": "^9.0.5",
     "stylelint-config-standard": "^34.0.0"

diff --git a/packages/snap/CHANGELOG.md b/packages/snap/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.1.0-beta.2
+
+### Patch Changes
+
+- [#509](https://github.com/blockchain-lab-um/masca/pull/509) [`0caf964`](https://github.com/blockchain-lab-um/masca/commit/0caf96495c05236aaf0aabc2b8abe19b09ad1607) Thanks [@pseudobun](https://github.com/pseudobun)! - Updates snap shasum.
+
 ## 1.1.0-beta.1
 
 ### Minor Changes

diff --git a/packages/snap/package.json b/packages/snap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@blockchain-lab-um/masca",
-  "version": "1.1.0-beta.1",
+  "version": "1.1.0-beta.2",
   "description": "Snap for managing VCs and VPs in MetaMask",
   "keywords": [
     "MetaMask",

diff --git a/packages/snap/snap.manifest.json b/packages/snap/snap.manifest.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.1.0-beta.1",
+  "version": "1.1.0-beta.2",
   "description": "Snap for managing VCs and VPs in MetaMask",
   "proposedName": "Masca",
   "repository": {
@@ -15,7 +15,7 @@
         "registry": "https://registry.npmjs.org"
       }
     },
-    "shasum": "CfbR75Rq/tHjBxu7c22DYXHSlP9D4k7n/Uvc9EWn7HA="
+    "shasum": "3Ad2GjuhlL4oRdOlzn/pVFlPxgHYIdeZZUuhEdqeqsY="
   },
   "initialPermissions": {
     "endowment:ethereum-provider": {},