Merge pull request #856 from hypersign-protocol/develop

Develop
hypersign-protocol · Feb 1, 2022 · 9893887 · 9893887
2 parents ce3882e + 6c61e8c
commit 9893887
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/components/admin/createProjectSlider/components/EventActionConfig.vue b/src/components/admin/createProjectSlider/components/EventActionConfig.vue
@@ -50,23 +50,23 @@
               <label for="prize" class="col-form-label">Prize name<span style="color: red">*</span>: </label>
           </div>
           <div class="col-lg-9 col-md-9 px-0">
-              <input   v-model="selected.title" type="text"   id="title" class="form-control w-100" placeholder="Please enter Prize Name" >
+              <input   v-model="selected.title" type="text"   id="title" class="form-control w-100" placeholder="Please enter prize name" >
           </div>  
         </div>
         <div class="row g-3 align-items-center w-100 mt-4" v-if="prize">
           <div class=" text-left col-lg-3 col-md-3 text-left">
               <label for="winners" class="col-form-label">Number of Winners<span style="color: red">*</span>: </label>
           </div>
           <div class="col-lg-9 col-md-9 px-0">
-              <input   v-model="prizeDetails.winners" type="text"   id="title" class="form-control w-100" placeholder="Please enter Prize Name" >
+              <input   v-model="prizeDetails.winners" type="text"   id="title" class="form-control w-100" placeholder="Please enter number of winners " >
           </div>  
         </div>
         <div class="row g-3 align-items-center w-100 mt-4" v-if="prize">
           <div class=" text-left col-lg-3 col-md-3 text-left">
               <label for="prixeValue" class="col-form-label">Prize Per Winner<span style="color: red">*</span>: </label>
           </div>
           <div class="col-lg-9 col-md-9 px-0">
-              <input   v-model="prizeDetails.prizeValue" type="text"   id="title" class="form-control w-100" placeholder="Please enter Prize Name" >
+              <input   v-model="prizeDetails.prizeValue" type="text"   id="title" class="form-control w-100" placeholder="Please enter prize per winner" >
           </div>  
         </div>
          <!-- contract address -->
@@ -499,7 +499,7 @@ export default {
             this.notifyErr(Messages.EVENTS.ACTIONS.PRIZECARD.PRIZE_TYPE)
           }else if(isEmpty(this.selected.title)){
             isvalid = false;
-            this.notifyErr(Messages.EVENTS.ACTIONS.EMPTY_TITLE);
+            this.notifyErr(Messages.EVENTS.ACTIONS.PRIZECARD.PRIZE_NAME_NOT_EMPTY);
           }else if(isEmpty(this.prizeDetails.winners)){
             isvalid = false
             this.notifyErr(Messages.EVENTS.ACTIONS.PRIZECARD.EMPTY_NO_OF_WINNERS)

diff --git a/src/components/participant/ActionInputs/ReefErc20.vue b/src/components/participant/ActionInputs/ReefErc20.vue
@@ -36,10 +36,9 @@
             <div class="metamask">
               <b-form-select
                 type="text"
-                :placeholder="data.placeHolder"
                 :options="options"
                 v-model="value.userWalletAddress"
-                :disabled="false"
+                :disabled="done"
                 :required="data.isManadatory"
               ></b-form-select>
             </div>
@@ -129,9 +128,11 @@ export default {
           this.web3 = window.injectedWeb3
           
         }
+        else{
+           this.showerror = true;
+        }
       } catch (error) {
         console.log(error);
-        this.showerror = true;
       }
 
 

diff --git a/src/utils/messages/admin/en.js b/src/utils/messages/admin/en.js
@@ -69,6 +69,7 @@ const EVENTS = {
 
     PRIZECARD:{
         PRIZE_TYPE: "Please select prize type",
+        PRIZE_NAME_NOT_EMPTY:"Prize name should not be empty",
         EMPTY_NO_OF_WINNERS: "Number of Winners Should not be empty",
         EMPTY_PRIZE_PER_WINNER: "Prize Per Winner Should not empty"
     }