fix(dapp): campaign verify failed popup (#619)

Signed-off-by: Urban Vidovič <[email protected]> Co-authored-by: martines3000 <[email protected]>
blockchain-lab-um · Apr 11, 2024 · 3b56e6f · 3b56e6f
1 parent 254d15b
commit 3b56e6f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/packages/dapp/src/components/CampaignsDisplay/RequirementDisplay.tsx b/packages/dapp/src/components/CampaignsDisplay/RequirementDisplay.tsx
@@ -84,10 +84,16 @@ export const RequirementDisplay = ({
     const queryCredentialsResult = await api.queryCredentials();
 
     if (isError(queryCredentialsResult)) {
+      useToastStore.setState({
+        open: true,
+        title: t('requirements-not-met'),
+        type: 'error',
+        loading: false,
+        link: null,
+      });
       setStartedVerifying(false);
       return;
     }
-
     // Create a presentation from all the user's credentials except the polygonid ones
     const createPresentationResult = await api.createPresentation({
       vcs: queryCredentialsResult.data.reduce((acc, queryResult) => {

diff --git a/packages/dapp/src/components/Controlbar/FilterPopover/CredentialTypes.tsx b/packages/dapp/src/components/Controlbar/FilterPopover/CredentialTypes.tsx
@@ -49,7 +49,8 @@ export const CredentialTypes = () => {
                 );
               }}
             >
-              clear ({credentialTypes.filter((type) => type.selected).length})
+              {t('clear')} (
+              {credentialTypes.filter((type) => type.selected).length})
             </button>
           ) : (
             <button

diff --git a/packages/dapp/src/components/Controlbar/FilterPopover/index.tsx b/packages/dapp/src/components/Controlbar/FilterPopover/index.tsx
@@ -30,7 +30,8 @@ function FilterPopover({ vcs }: FilterPopoverProps) {
         return;
       }
       vc.data.type.forEach((type: string) => {
-        if (type !== 'VerifiableCredential') allCredentialTypes.push(type);
+        // if (type !== 'VerifiableCredential')
+        allCredentialTypes.push(type);
       });
     });
     const availableCredentialTypes = [...new Set(allCredentialTypes)];

diff --git a/packages/dapp/src/components/DashboardDisplay/utils.tsx b/packages/dapp/src/components/DashboardDisplay/utils.tsx
@@ -129,15 +129,13 @@ export const filterColumnsType = (
   const availableTypes = types
     .filter((type) => type.selected)
     .map((type) => type.type);
+
   const filteredList = credentialList.filter((credential) => {
     const { type } = credential.data;
     if (!type) return false;
 
     for (const typ of availableTypes) {
-      if (
-        (typeof type === 'string' && type === typ) ||
-        (Array.isArray(type) && type.indexOf(typ) >= 0)
-      ) {
+      if ((typeof type === 'string' && type === typ) || Array.isArray(type)) {
         return true;
       }
     }

diff --git a/packages/dapp/src/messages/en.json b/packages/dapp/src/messages/en.json
@@ -203,7 +203,8 @@
     "rewards": "Rewards"
   },
   "RequirementDisplay": {
-    "verify": "Verify"
+    "verify": "Verify",
+    "requirements-not-met": "You do not meet the requirements"
   },
   "RewardDisplay": {},
   "CredentialCard": {
@@ -365,7 +366,7 @@
     "title": "Delete Shared Presentation"
   },
   "FilterPopover": {
-    "clear": "clear",
+    "clear": "Clear",
     "datastore": "Data Store",
     "ecosystem": "Ecosystem",
     "filter": "Filter",