diff --git a/packages/dapp/src/components/VCTable/index.tsx b/packages/dapp/src/components/VCTable/index.tsx
index c83f4dd65..de4b0a68b 100644
--- a/packages/dapp/src/components/VCTable/index.tsx
+++ b/packages/dapp/src/components/VCTable/index.tsx
@@ -75,16 +75,6 @@ const Table = () => {
}),
shallow
);
- const { setTitle, setToastLoading, setToastOpen, setType } = useToastStore(
- (state) => ({
- setTitle: state.setTitle,
- setText: state.setText,
- setToastLoading: state.setLoading,
- setToastOpen: state.setOpen,
- setType: state.setType,
- }),
- shallow
- );
const columnHelper = createColumnHelper();
const [deleteModalOpen, setDeleteModalOpen] = useState(false);
@@ -299,15 +289,16 @@ const Table = () => {
const loadVCs = async () => {
if (!api) return;
const loadedVCs = await api.queryVCs();
+
if (isError(loadedVCs)) {
- setToastOpen(false);
setTimeout(() => {
- setTitle('Failed to load credential');
- setType('error');
- setToastLoading(false);
- setToastOpen(true);
- }, 100);
- console.log('Failed to load VCs');
+ useToastStore.setState({
+ open: true,
+ title: 'Failed to load credentials',
+ type: 'error',
+ loading: false,
+ });
+ }, 200);
return;
}
@@ -316,14 +307,25 @@ const Table = () => {
if (loadedVCs.data) {
changeVcs(loadedVCs.data);
if (loadedVCs.data.length === 0) {
- setToastOpen(false);
setTimeout(() => {
- setTitle('No credentials found');
- setType('error');
- setLoading(false);
- setToastOpen(true);
- }, 100);
+ useToastStore.setState({
+ open: true,
+ title: 'No credentials found',
+ type: 'info',
+ loading: false,
+ });
+ }, 200);
+ return;
}
+
+ setTimeout(() => {
+ useToastStore.setState({
+ open: true,
+ title: 'Credentials loaded',
+ type: 'success',
+ loading: false,
+ });
+ }, 200);
}
};
diff --git a/packages/dapp/src/messages/en.json b/packages/dapp/src/messages/en.json
index 1a8932615..9c8ccbf63 100644
--- a/packages/dapp/src/messages/en.json
+++ b/packages/dapp/src/messages/en.json
@@ -15,7 +15,8 @@
"dashboard": "Dashboard",
"settings": "Settings",
"get-credential": "Get Credential",
- "authorization-request": "Authorization Request"
+ "authorization-request": "Authorization Request",
+ "qr-code-session": "QR Code Session"
},
"AppNavbar": {
"connect": "Connect Wallet",
@@ -25,6 +26,7 @@
"settings": "Settings",
"get-credential": "Get Credential",
"authorization-request": "Authorization Request",
+ "qr-code-session": "QR Code Session",
"other": "Other"
},
"dropdown": {
diff --git a/packages/dapp/src/stores/index.ts b/packages/dapp/src/stores/index.ts
index cc52ac96d..cbac77b12 100644
--- a/packages/dapp/src/stores/index.ts
+++ b/packages/dapp/src/stores/index.ts
@@ -2,3 +2,4 @@ export * from './generalStore';
export * from './snapStore';
export * from './tableStore';
export * from './toastStore';
+export * from './sessionStore';
diff --git a/packages/dapp/src/stores/sessionStore.ts b/packages/dapp/src/stores/sessionStore.ts
new file mode 100644
index 000000000..58be91cc8
--- /dev/null
+++ b/packages/dapp/src/stores/sessionStore.ts
@@ -0,0 +1,25 @@
+import { create } from 'zustand';
+
+interface SessionStore {
+ sessionId: string | null;
+ key: CryptoKey | null;
+ exp: number | null;
+
+ changeSessionId: (sessionId: string) => void;
+ changeKey: (key: CryptoKey) => void;
+ changeExp: (exp: number) => void;
+}
+
+export const sessionStoreInitialState = {
+ sessionId: null,
+ key: null,
+ exp: null,
+};
+
+export const useSessionStore = create()((set) => ({
+ ...sessionStoreInitialState,
+
+ changeSessionId: (sessionId: string) => set({ sessionId }),
+ changeKey: (key: CryptoKey) => set({ key }),
+ changeExp: (exp: number) => set({ exp }),
+}));
diff --git a/packages/dapp/src/stores/toastStore.ts b/packages/dapp/src/stores/toastStore.ts
index c7c208079..054c4ce8c 100644
--- a/packages/dapp/src/stores/toastStore.ts
+++ b/packages/dapp/src/stores/toastStore.ts
@@ -1,17 +1,13 @@
import { create } from 'zustand';
+type ToastType = 'info' | 'success' | 'error' | 'normal';
+
interface ToastStore {
open: boolean;
loading: boolean;
text: string;
title: string;
- type: string;
-
- setOpen: (open: boolean) => void;
- setLoading: (loading: boolean) => void;
- setText: (text: string) => void;
- setTitle: (title: string) => void;
- setType: (type: string) => void;
+ type: ToastType;
}
export const toastStoreInitialState = {
@@ -19,15 +15,9 @@ export const toastStoreInitialState = {
loading: false,
text: '',
title: '',
- type: 'info',
+ type: 'info' as ToastType,
};
-export const useToastStore = create()((set) => ({
+export const useToastStore = create()(() => ({
...toastStoreInitialState,
-
- setType: (type) => set({ type }),
- setOpen: (open) => set({ open }),
- setLoading: (loading) => set({ loading }),
- setText: (text) => set({ text }),
- setTitle: (title) => set({ title }),
}));
diff --git a/packages/dapp/src/styles/globals.css b/packages/dapp/src/styles/globals.css
index 3f619ca58..630720d2a 100644
--- a/packages/dapp/src/styles/globals.css
+++ b/packages/dapp/src/styles/globals.css
@@ -10,7 +10,9 @@
html {
overflow: hidden;
- max-height: 100vh;
+ position: fixed;
+ height: 100%;
+ width: 100%;
}
html,
diff --git a/packages/dapp/src/utils/prisma.ts b/packages/dapp/src/utils/prisma.ts
new file mode 100644
index 000000000..e2b960527
--- /dev/null
+++ b/packages/dapp/src/utils/prisma.ts
@@ -0,0 +1,9 @@
+import { PrismaClient } from '@prisma/client';
+
+const globalForPrisma = globalThis as unknown as {
+ prisma: PrismaClient | undefined;
+};
+
+export const prisma = globalForPrisma.prisma ?? new PrismaClient();
+
+if (process.env.NODE_ENV !== 'production') globalForPrisma.prisma = prisma;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e5d20faf3..9a6a747ac 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1162,6 +1162,9 @@ importers:
'@metamask/providers':
specifier: ^10.2.0
version: 10.2.0
+ '@prisma/client':
+ specifier: ^4.16.1
+ version: 4.16.1(prisma@4.16.1)
'@radix-ui/react-toast':
specifier: ^1.1.4
version: 1.1.4(@types/react-dom@18.2.6)(@types/react@18.2.7)(react-dom@18.2.0)(react@18.2.0)
@@ -1186,6 +1189,9 @@ importers:
ethers:
specifier: ^6.5.1
version: 6.5.1
+ html5-qrcode:
+ specifier: ^2.3.8
+ version: 2.3.8
lint-staged:
specifier: ^13.2.2
version: 13.2.2
@@ -1210,6 +1216,9 @@ importers:
prop-types:
specifier: ^15.8.1
version: 15.8.1
+ qrcode.react:
+ specifier: ^3.1.0
+ version: 3.1.0(react@18.2.0)
qs:
specifier: ^6.11.2
version: 6.11.2
@@ -1219,6 +1228,9 @@ importers:
react-dom:
specifier: 18.2.0
version: 18.2.0(react@18.2.0)
+ swr:
+ specifier: ^2.2.0
+ version: 2.2.0(react@18.2.0)
tailwind-scrollbar:
specifier: ^3.0.4
version: 3.0.4(tailwindcss@3.3.2)
@@ -1280,6 +1292,9 @@ importers:
prettier-plugin-packagejson:
specifier: ^2.4.3
version: 2.4.3(prettier@2.8.8)
+ prisma:
+ specifier: ^4.16.1
+ version: 4.16.1
rimraf:
specifier: ^5.0.1
version: 5.0.1
@@ -9800,6 +9815,28 @@ packages:
resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==}
dev: false
+ /@prisma/client@4.16.1(prisma@4.16.1):
+ resolution: {integrity: sha512-CoDHu7Bt+NuDo40ijoeHP79EHtECsPBTy3yte5Yo3op8TqXt/kV0OT5OrsWewKvQGKFMHhYQ+ePed3zzjYdGAw==}
+ engines: {node: '>=14.17'}
+ requiresBuild: true
+ peerDependencies:
+ prisma: '*'
+ peerDependenciesMeta:
+ prisma:
+ optional: true
+ dependencies:
+ '@prisma/engines-version': 4.16.0-66.b20ead4d3ab9e78ac112966e242ded703f4a052c
+ prisma: 4.16.1
+ dev: false
+
+ /@prisma/engines-version@4.16.0-66.b20ead4d3ab9e78ac112966e242ded703f4a052c:
+ resolution: {integrity: sha512-tMWAF/qF00fbUH1HB4Yjmz6bjh7fzkb7Y3NRoUfMlHu6V+O45MGvqwYxqwBjn1BIUXkl3r04W351D4qdJjrgvA==}
+ dev: false
+
+ /@prisma/engines@4.16.1:
+ resolution: {integrity: sha512-gpZG0kGGxfemgvK/LghHdBIz+crHkZjzszja94xp4oytpsXrgt/Ice82MvPsWMleVIniKuARrowtsIsim0PFJQ==}
+ requiresBuild: true
+
/@radix-ui/primitive@1.0.1:
resolution: {integrity: sha512-yQ8oGX2GVsEYMWGxcovu1uGWPCxV5BFfeeYxqPmuAzUyLT9qmaMXSAhXpb0WrspIeqYzdJpkh2vHModJPgRIaw==}
dependencies:
@@ -18642,6 +18679,10 @@ packages:
tapable: 2.2.1
webpack: 5.82.1(@swc/core@1.3.52)(webpack-cli@5.1.1)
+ /html5-qrcode@2.3.8:
+ resolution: {integrity: sha512-jsr4vafJhwoLVEDW3n1KvPnCCXWaQfRng0/EEYk1vNcQGcG/htAdhJX0be8YyqMoSz7+hZvOZSTAepsabiuhiQ==}
+ dev: false
+
/htmlescape@1.1.1:
resolution: {integrity: sha512-eVcrzgbR4tim7c7soKQKtxa/kQM4TzjnlU83rcZ9bHU6t31ehfV7SktN6McWgwPWg+JYMA/O3qpGxBvFq1z2Jg==}
engines: {node: '>=0.10'}
@@ -23741,6 +23782,14 @@ packages:
react: 18.2.0
dev: false
+ /prisma@4.16.1:
+ resolution: {integrity: sha512-C2Xm7yxHxjFjjscBEW4tmoraPHH/Vyu/A0XABdbaFtoiOZARsxvOM7rwc2iZ0qVxbh0bGBGBWZUSXO/52/nHBQ==}
+ engines: {node: '>=14.17'}
+ hasBin: true
+ requiresBuild: true
+ dependencies:
+ '@prisma/engines': 4.16.1
+
/prismjs@1.29.0:
resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
engines: {node: '>=6'}
@@ -23884,6 +23933,14 @@ packages:
hasBin: true
dev: true
+ /qrcode.react@3.1.0(react@18.2.0):
+ resolution: {integrity: sha512-oyF+Urr3oAMUG/OiOuONL3HXM+53wvuH3mtIWQrYmsXoAq0DkvZp2RYUWFSMFtbdOpuS++9v+WAkzNVkMlNW6Q==}
+ peerDependencies:
+ react: ^16.8.0 || ^17.0.0 || ^18.0.0
+ dependencies:
+ react: 18.2.0
+ dev: false
+
/qs@6.11.0:
resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==}
engines: {node: '>=0.6'}
@@ -26313,6 +26370,15 @@ packages:
swagger-ui-dist: 4.19.0
dev: true
+ /swr@2.2.0(react@18.2.0):
+ resolution: {integrity: sha512-AjqHOv2lAhkuUdIiBu9xbuettzAzWXmCEcLONNKJRba87WAefz8Ca9d6ds/SzrPc235n1IxWYdhJ2zF3MNUaoQ==}
+ peerDependencies:
+ react: ^16.11.0 || ^17.0.0 || ^18.0.0
+ dependencies:
+ react: 18.2.0
+ use-sync-external-store: 1.2.0(react@18.2.0)
+ dev: false
+
/symbol-observable@4.0.0:
resolution: {integrity: sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==}
engines: {node: '>=0.10'}
From da0d7779c760fc757a1ac2e81af5369c4d2f0484 Mon Sep 17 00:00:00 2001
From: Martin Domajnko
Date: Wed, 28 Jun 2023 13:26:10 +0200
Subject: [PATCH 2/3] chore: remove setToastOpen
---
packages/dapp/src/components/Controlbar/Controlbar.tsx | 1 -
1 file changed, 1 deletion(-)
diff --git a/packages/dapp/src/components/Controlbar/Controlbar.tsx b/packages/dapp/src/components/Controlbar/Controlbar.tsx
index d7de1ce07..45e4122da 100644
--- a/packages/dapp/src/components/Controlbar/Controlbar.tsx
+++ b/packages/dapp/src/components/Controlbar/Controlbar.tsx
@@ -100,7 +100,6 @@ const Controlbar = () => {
console.log(normalizationError);
setSpinner(false);
- setToastOpen(false);
setTimeout(() => {
useToastStore.setState({
open: true,
From 3d1d45624c3a05ab50cee2209455fac984e9e70a Mon Sep 17 00:00:00 2001
From: Martin Domajnko
Date: Wed, 28 Jun 2023 13:46:03 +0200
Subject: [PATCH 3/3] chore: remove manifest.json
---
packages/dapp/src/app/[locale]/layout.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/dapp/src/app/[locale]/layout.tsx b/packages/dapp/src/app/[locale]/layout.tsx
index b40855df3..f6b9b5d4c 100644
--- a/packages/dapp/src/app/[locale]/layout.tsx
+++ b/packages/dapp/src/app/[locale]/layout.tsx
@@ -79,7 +79,7 @@ export const metadata: Metadata = {
verification: {
google: 'snsvYv9eAKOZ7FrIjpUSnUtqgoFiSXQWROVrStPBc8I',
},
- manifest: '/manifest.json',
+ manifest: null,
};
export function generateStaticParams() {