From a47663d66d2ab685f152cf636571391b6201dadc Mon Sep 17 00:00:00 2001
From: ciniiia <cinia@blocksphere.id>
Date: Mon, 12 Dec 2022 11:20:33 +0700
Subject: [PATCH] fix: minor bugs in service form (#606)

Co-authored-by: ciniaeleonora <ciniadelamotte@gmail.com>
Co-authored-by: Hildegard Lydia <37687466+hilyds@users.noreply.github.com>
---
 src/views/Dashboard/Lab/Registration/Services/List.vue  | 2 +-
 src/views/Dashboard/Lab/Registration/Services/index.vue | 2 +-
 src/views/Dashboard/Lab/Services/Add.vue                | 2 +-
 src/views/Dashboard/Lab/Services/Detail.vue             | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/Dashboard/Lab/Registration/Services/List.vue b/src/views/Dashboard/Lab/Registration/Services/List.vue
index 1496c775..bcc45cb4 100644
--- a/src/views/Dashboard/Lab/Registration/Services/List.vue
+++ b/src/views/Dashboard/Lab/Registration/Services/List.vue
@@ -212,7 +212,7 @@ export default {
     },
 
     priceByCurrency(amount, currency) {
-      let price = this.web3.utils.fromWei(amount, currency === "USDT" || currency === "USDTE" ? "mwei" : "ether")
+      let price = this.web3.utils.fromWei(amount, currency === "USDT" || currency === "USDTE" || currency === "USDT.e" ? "mwei" : "ether")
       return `${price} ${currency}`
     }
   }
diff --git a/src/views/Dashboard/Lab/Registration/Services/index.vue b/src/views/Dashboard/Lab/Registration/Services/index.vue
index 9c3110e9..bf2cb70c 100644
--- a/src/views/Dashboard/Lab/Registration/Services/index.vue
+++ b/src/views/Dashboard/Lab/Registration/Services/index.vue
@@ -177,7 +177,7 @@
                     :rules="longDescriptionRules"
                   ></v-textarea>
 
-                  <label style="font-size: 12px;"> Does your lab provide test kit that can be purchased separately for this service? </label>
+                  <label style="font-size: 12px;"> Does your lab provide test kit that can be purchased separately for this service </label>
                   <v-radio-group v-model="document.linkKit" row>
                     <v-radio label="Yes" value="yes"></v-radio>
                     <v-radio label="No" value="no"></v-radio>
diff --git a/src/views/Dashboard/Lab/Services/Add.vue b/src/views/Dashboard/Lab/Services/Add.vue
index dd1dcf87..4c81a53f 100644
--- a/src/views/Dashboard/Lab/Services/Add.vue
+++ b/src/views/Dashboard/Lab/Services/Add.vue
@@ -209,7 +209,7 @@
                       :rules="[...fieldRequiredRule]"
                     />
 
-                    <label style="font-size: 12px;"> Does your lab provide test kit that can be purchased separately for this service? </label>
+                    <label style="font-size: 12px;"> Does your lab provide test kit that can be purchased separately for this service </label>
                     <v-radio-group v-model="document.linkKit">
                       <v-radio label="Yes" value="yes"></v-radio>
                       <v-radio label="No" value="no"></v-radio>
diff --git a/src/views/Dashboard/Lab/Services/Detail.vue b/src/views/Dashboard/Lab/Services/Detail.vue
index 2720e796..1f4c2ccf 100644
--- a/src/views/Dashboard/Lab/Services/Detail.vue
+++ b/src/views/Dashboard/Lab/Services/Detail.vue
@@ -186,6 +186,7 @@
                       :rules="fieldRequiredRule"
                     ></v-textarea>
 
+                    <label style="font-size: 12px;"> Does your lab provide test kit that can be purchased separately for this service </label>
                     <v-radio-group v-model="document.linkKit">
                       <v-radio label="Yes" value="yes"></v-radio>
                       <v-radio label="No" value="no"></v-radio>
@@ -404,7 +405,7 @@ export default {
     this.id = this.$route.params.id
     await this.getServiceCategory()
     await this.getService(this.$route.params.id)
-    this.usdRate = await getConversionCache(this.document.currency, "USD")
+    this.usdRate = await getConversionCache(this.document.currency === "USDT.e" ? "USDT" : this.document.currency, "USD")
   },
 
   methods: {