From 7cb15e582aa2d7b1c3768e0d9d28095f4385b5ab Mon Sep 17 00:00:00 2001
From: Leonie Fritsch <leonie.fritsch@eecc.de>
Date: Tue, 10 Sep 2024 15:37:01 +0200
Subject: [PATCH] refactoring

---
 .../src/components/PresentationRequest.vue     |  7 +++----
 frontend/src/views/PresentationRequest.vue     | 18 +++++++++---------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/PresentationRequest.vue b/frontend/src/components/PresentationRequest.vue
index 2595a99..a099bc3 100644
--- a/frontend/src/components/PresentationRequest.vue
+++ b/frontend/src/components/PresentationRequest.vue
@@ -60,7 +60,7 @@ export default {
             default: 'verify'
         },
         composeTypesWithOr: {
-            type: Boolean, 
+            type: Boolean,
             default: false
         }
     },
@@ -117,14 +117,13 @@ export default {
                 definition.input_descriptors.push(
                     getInputDescriptor(this.credentialTypes.join("|"))
                 );
-            } 
-            if (!this.composeTypesWithOr) {
+            } else {
                 for (const credentialType of this.credentialTypes) {
                     definition.input_descriptors.push(
                         getInputDescriptor(credentialType)
                     );
                 }
-            } 
+            }
             return definition;
 
         },
diff --git a/frontend/src/views/PresentationRequest.vue b/frontend/src/views/PresentationRequest.vue
index 9189492..28a7aa1 100644
--- a/frontend/src/views/PresentationRequest.vue
+++ b/frontend/src/views/PresentationRequest.vue
@@ -49,20 +49,20 @@
                 <div class="row mx-md-3" v-if="customCredentialTypes.length >= 2">
                     <div class="col-6 mt-2">
                         <div class="form-check form-switch">
-                            <input v-model="composeTypesWithOr" class="form-check-input" type="checkbox" id="composeTypesWithOrSwitch">
+                            <input v-model="composeTypesWithOr" class="form-check-input" type="checkbox"
+                                id="composeTypesWithOrSwitch">
                             <label class="form-check-label" for="composeTypesWithOrSwitch">
                                 <small>any credential is sufficient</small>
                             </label>
                         </div>
                     </div>
-               </div>
-            </div>
-            <div v-if="selectedCredential === 'custom'">
-                <PresentationRequest :credentialTypes="customCredentialTypes" :composeTypesWithOr="composeTypesWithOr"/>
-            </div>
-            <div v-if="selectedCredential === 'any'">
-                <PresentationRequest :credentialTypes="['']" :composeTypesWithOr="false"/>
+                </div>
             </div>
+
+            <PresentationRequest :credentialTypes="selectedCredential === 'custom' ? customCredentialTypes : ['']"
+                :composeTypesWithOr="selectedCredential === 'custom' ? composeTypesWithOr : false" />
+
+
         </div>
     </div>
 </template>
@@ -81,6 +81,6 @@ export default {
     },
     components: {
         PresentationRequest
-    }, 
+    },
 }
 </script>
\ No newline at end of file