Merge pull request #1839 from /issues/1838

fixed issues/1838
hypersign-protocol · Jan 6, 2023 · 98ed9a9 · 98ed9a9
2 parents 3217ac3 + 4b972fd
commit 98ed9a9
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/src/components/admin/marketPlaceSlider/marketPlaceSlide.vue b/src/components/admin/marketPlaceSlider/marketPlaceSlide.vue
@@ -425,7 +425,8 @@ export default {
         this.data.inputData = [...locations]
         const url = `${this.$config.studioServer.BASE_URL}api/v1/reward/distribution/serviceFee`;
         let data = {}
-        data = { ...this.data }
+        data = { ...this.data }        
+        data["eventId"] = this.eventToAirdrop._id
         const headers = {
           "Content-Type": "application/json",
           Authorization: `Bearer ${this.authToken}`,

diff --git a/src/components/participant/ActionInputs/RewardClaimAction.vue b/src/components/participant/ActionInputs/RewardClaimAction.vue
@@ -153,7 +153,7 @@ export default {
         `<span class="mr-auto">ABCD</span>`;
         element.forEach((element, index) => {
        */
-      console.log(list);
+      
       const groupByMake = (list = []) => {
         let result = [];
         result = list.reduce((r, a) => {
@@ -166,8 +166,11 @@ export default {
       list = groupByMake(json)
       var swal_html = `<div class="list-group list-group-flush" style="max-height:500px;overflow-y: scroll;">`;
       var groupName = `<div style="font-weight:bold">`   
-      this.claimData.forEach((el) => {         
-        let ele = list[el._id]        
+      this.claimData.forEach((el) => {                        
+        let ele = list[el._id]
+        if(ele === undefined) {
+          return
+        }    
         ele.forEach((x,index)=>{          
           groupName = el.title
           swal_html = swal_html + `<strong class="grpName pt-3" style="text-align: left;">`+ groupName +`</strong>`

diff --git a/src/views/admin/Events.vue b/src/views/admin/Events.vue
@@ -1077,6 +1077,19 @@ export default {
         if(indexToFindNotification > -1) {
           this.eventActionList.splice(indexToFindNotification, 1);
         }
+      this.eventActionList.forEach((action)=>{
+        if(action.type === "PRIZE_CARD") {                            
+            const parsedData = JSON.parse(action.value)
+            if(parsedData.type ==="Tokens" && parsedData.isDistributed===true) {
+              delete parsedData["isDistributed"];
+              delete parsedData["externalRecordId"];
+              delete parsedData["contractAddress"];
+              delete parsedData["appBaseUrl"];
+              delete parsedData["chainId"];              
+              return action.value = JSON.stringify(parsedData);
+            }          
+        }
+      })            
       this.tagsTemp = project.tags;      
       await this.saveProject();
     },

diff --git a/src/views/participant/Event.vue b/src/views/participant/Event.vue
@@ -29,7 +29,7 @@
 
     <template v-if="authToken != '' && authToken != null">
 
-      <ErrorMessage v-if="isEventOver && !checkIfRewardDistributed" errorMessage="Event is over awaiting for reward distribution" />
+      <ErrorMessage v-if="isEventOver && !checkIfRewardDistributed" errorMessage="Event is over" />
       <Action v-if="checkIfRewardDistributed"      
       @UserUpdateEvent="updateUserData" :themeData="eventData.orgData"      
       :ActionSchema="eventActionsToShow"