Merge branch 'main' into use_staging

ForkbombEu · Oct 3, 2024 · 4dd9319 · 4dd9319
2 parents 2884ad6 + 768241c
commit 4dd9319
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 38 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [1.21.2](https://github.com/ForkbombEu/verifier/compare/v1.21.1...v1.21.2) (2024-09-17)
+
+
+### Bug Fixes
+
+* qr code shoul encode an intent url, not a json ([#71](https://github.com/ForkbombEu/verifier/issues/71)) ([0dcbfbe](https://github.com/ForkbombEu/verifier/commit/0dcbfbe99697f1c138a080bff21f4dee457e8e7c))
+
 ## [1.21.1](https://github.com/ForkbombEu/verifier/compare/v1.21.0...v1.21.1) (2024-09-10)
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "verifier",
-  "version": "1.21.1",
+  "version": "1.21.2",
   "private": true,
   "scripts": {
     "dev": "vite dev --host",
@@ -91,7 +91,7 @@
     "prettier-plugin-organize-imports": "^3.2.4",
     "svelte-preprocess": "^5.1.4",
     "sveltekit-superforms": "~1.13.4",
-    "zenroom": "^4.38.0",
+    "zenroom": "^4.38.1",
     "zod": "^3.23.8"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/lib/mobile_zencode b/src/lib/mobile_zencode
+13 −29		Makefile
+8 −4		test/bats_utils
+16 −16		test/step_test.yml
+11 −10		test/wallet.bats
+3 −3		verifier/card_to_qr.data.json
+2 −1		verifier/card_to_qr.keys.json
+17 −16		verifier/card_to_qr.zen