Merge pull request #175 from BitCannaGlobal/Apply-fonts-to-missing-la…

…bels Fix fonts at TX waiting & TX confirmation forms
BitCannaGlobal · Jan 17, 2024 · 89ffc2c · 89ffc2c
2 parents dd5afa6 + a561358
commit 89ffc2c
Show file tree

Hide file tree

Showing 11 changed files with 101 additions and 44 deletions.
diff --git a/app.vue b/app.vue
@@ -306,7 +306,9 @@ export default {
 } 
 .carmenBold {
     font-family: 'CarmenBold';
-
+}
+.carmenLight {
+    font-family: 'CarmenLight';
 } 
 
 .tile {

diff --git a/components/ClaimAllModal.vue b/components/ClaimAllModal.vue
@@ -159,7 +159,10 @@
             </v-row>    
           </v-form>
 
-          <v-row v-if="step3">
+          <v-row
+            v-if="step3"
+            class="carmenBold"
+          >
             <v-col
               cols="12"
               align="center"
@@ -175,7 +178,10 @@
               <h4>Your transaction is waiting to get approved on the blockchain.</h4>
             </v-col>
           </v-row>
-          <v-row v-if="step4">
+          <v-row
+            v-if="step4"
+            class="carmenBold"
+          >
             <v-col
               cols="12"
               align="center"

diff --git a/components/DelegateHomeModal.vue b/components/DelegateHomeModal.vue
@@ -5,7 +5,7 @@
       min-width="200"
       class="mt-8 white--text"
       color="#0FB786"
-      @click="dialog = true"
+      @click="openDialog()"
     >
       <v-icon class="mr-2">
         mdi-cube-send
@@ -67,7 +67,7 @@
           > 
             <v-row>
               <v-col cols="12">
-                <span class="text-left carmenBold">Available: {{ amount }} BCNA</span>
+                <span class="text-left carmenBold">Available: {{ amountAvailable }} BCNA</span>
                 <br><br> 
                 <h3 class="mt-1 ml-1 carmenBold">
                   Amount to delegate*
@@ -237,7 +237,10 @@
           </v-row> -->
           </v-form>
 
-          <v-row v-if="step3">
+          <v-row
+            v-if="step3"
+            class="carmenBold"
+          >
             <v-col
               cols="12"
               align="center"
@@ -253,7 +256,10 @@
               <h4>Your transaction is waiting to get approved on the blockchain.</h4>
             </v-col>
           </v-row>
-          <v-row v-if="step4">
+          <v-row
+            v-if="step4"
+            class="carmenBold"
+          >
             <v-col
               cols="12"
               align="center"
@@ -329,7 +335,7 @@ function countPlaces(num) {
 export default {
   props: [
     "chainIdProps",
-    "balances",
+    "amountAvailable",
   ],
   setup() {
     const store = useAppStore()
@@ -360,15 +366,15 @@ export default {
           'valoper"',
       // v => bech32Validation(v) || 'Bad address (not bech32) ' + bech32Validation(v),
     ],
-    amount: instance.balances,
+    amount: instance.amountAvailable,
     amountFinal: "",
     amountRules: [
       (v) => !!v || "Amount is required",
       (v) => !isNaN(v) || "Amount must be number",
       (v) =>
-        v <= instance.balances ||
+        v <= instance.amountAvailable ||
         "Amount must be above delegated amount (" +
-          instance.balances +
+          instance.amountAvailable +
           ")",
       (v) => countPlaces(v) < 7 || "Bad decimal",
     ],
@@ -397,29 +403,34 @@ export default {
       }
     },
   },
-  async mounted() {
-    
-    //await this.store.getStakingModule()
-    const selectValidatorList = [];
-    for (const i of this.store.allValidators) {
-      selectValidatorList.push({
-        'name': i.name,
-        'address': i.op_address,
-      });
-    }  
-    
-    this.validatorList = selectValidatorList;
-    this.validatorListSearch = this.validatorList;
+ 
+  created() {
+ 
+
   },  
   methods: {
+    openDialog() {
+      this.dialog = true;
+      //await this.store.getStakingModule()
+      const selectValidatorList = [];
+      for (const i of this.store.allValidators) {
+        selectValidatorList.push({
+          'name': i.name,
+          'address': i.op_address,
+        });
+      }  
+      
+      this.validatorList = selectValidatorList;
+      this.validatorListSearch = this.validatorList; 
+    },
     getMax() {
-      this.amountFinal = this.amount;
+      this.amountFinal = this.amountAvailable;
     },
     getHalf() {
-      this.amountFinal = (this.amount / 2).toFixed(6);
+      this.amountFinal = (this.amountAvailable / 2).toFixed(6);
     },
     getQuarter() {
-      this.amountFinal = (this.amount / 4).toFixed(6);
+      this.amountFinal = (this.amountAvailable / 4).toFixed(6);
     },
     searchVal() {
       if (!this.searchTerm) {

diff --git a/components/DelegateModal.vue b/components/DelegateModal.vue
@@ -235,7 +235,10 @@
             </v-row>
           </v-form>
 
-          <v-row v-if="step3">
+          <v-row
+            v-if="step3"
+            class="carmenBold"
+          >
             <v-col
               cols="12"
               align="center"
@@ -251,7 +254,10 @@
               <h4>Your transaction is waiting to get approved on the blockchain.</h4>
             </v-col>
           </v-row>
-          <v-row v-if="step4">
+          <v-row
+            v-if="step4"
+            class="carmenBold"
+          >
             <v-col
               cols="12"
               align="center"

diff --git a/components/RedelegateModal.vue b/components/RedelegateModal.vue
@@ -263,7 +263,10 @@
             </v-row>
           </v-form>
 
-          <v-row v-if="step3">
+          <v-row
+            v-if="step3"
+            class="carmenBold"
+          >
             <v-col
               cols="12"
               align="center"
@@ -279,7 +282,10 @@
               <h4>Your transaction is waiting to get approved on the blockchain.</h4>
             </v-col>
           </v-row>
-          <v-row v-if="step4">
+          <v-row
+            v-if="step4"
+            class="carmenBold"
+          >
             <v-col
               cols="12"
               align="center"

diff --git a/components/SendModal.vue b/components/SendModal.vue
@@ -242,7 +242,10 @@
             </v-row>
           </v-form>
 
-          <v-row v-if="step3">
+          <v-row
+            v-if="step3"
+            class="carmenBold"
+          >
             <v-col
               cols="12"
               align="center"
@@ -258,7 +261,10 @@
               <h4>Your transaction is waiting to get approved on the blockchain.</h4>
             </v-col>
           </v-row>
-          <v-row v-if="step4">
+          <v-row
+            v-if="step4"
+            class="carmenBold"
+          >
             <v-col
               cols="12"
               align="center"

diff --git a/components/SoloRewardModal.vue b/components/SoloRewardModal.vue
@@ -111,7 +111,10 @@
             </v-row>
           </v-form>
 
-          <v-row v-if="step3">
+          <v-row
+            v-if="step3"
+            class="carmenBold"
+          >
             <v-col
               cols="12"
               align="center"
@@ -127,7 +130,10 @@
               <h4>Your transaction is waiting to get approved on the blockchain.</h4>
             </v-col>
           </v-row>
-          <v-row v-if="step4">
+          <v-row
+            v-if="step4"
+            class="carmenBold"
+          >
             <v-col
               cols="12"
               align="center"

diff --git a/components/UndelegateSingleModal.vue b/components/UndelegateSingleModal.vue
@@ -223,7 +223,10 @@
             </v-row>
           </v-form>
 
-          <v-row v-if="step3">
+          <v-row
+            v-if="step3"
+            class="carmenBold"
+          >
             <v-col
               cols="12"
               align="center"
@@ -239,7 +242,10 @@
               <h4>Your transaction is waiting to get approved on the blockchain.</h4>
             </v-col>
           </v-row>
-          <v-row v-if="step4">
+          <v-row
+            v-if="step4"
+            class="carmenBold"
+          >
             <v-col
               cols="12"
               align="center"

diff --git a/pages/index.vue b/pages/index.vue
@@ -325,11 +325,11 @@
                         color="#0FB786"
                       >
                         Stake
-                      </v-btn> -->
+                      </v-btn> --> 
                     <DelegateHomeModal
                       v-if="store.logged"
                       :chain-id-props="cosmosConfig[store.chainSelected].coinLookup.addressPrefix"
-                      :balances="store.spendableBalances"
+                      :amount-available="store.spendableBalances"
                     />                      
                   </span>
                 </v-col>
@@ -509,6 +509,7 @@ import axios from "axios"
 import dayjs from "dayjs"
 import QRCodeVue3 from "qrcode-vue3"
 import useClipboard from '~/composables/useClipboard'
+ 
 import { reverse, sortBy, orderBy, uniqWith, groupBy } from "lodash"
 
 
@@ -533,7 +534,7 @@ const categories = [
 
 export default {
   components: {
-    QRCodeVue3
+    QRCodeVue3 
   },
   layout: "blog",
   setup() {

diff --git a/pages/proposals/index.vue b/pages/proposals/index.vue
@@ -244,7 +244,7 @@
                     max-width="32"
                     max-height="32"
                     :src="cosmosConfig[store.chainSelected].coinLookup.icon"
-                    alt="Bitcanna"
+                    alt="BitCanna"
                   ></v-img>
                 </v-avatar>
             </template>
@@ -258,7 +258,7 @@
               <v-btn icon="mdi-close" @click="dialog = false"></v-btn>
             </template>
           </v-toolbar> 
-        <v-card-text class="mt-6">
+        <v-card-text class="mt-6 carmenLight" >
 
           <v-form
             v-if="step1"
@@ -633,7 +633,10 @@
         </v-form> 
 
 
-        <v-row v-if="step3">
+          <v-row
+            v-if="step3"
+            class="carmenBold"
+          >
             <v-col
               cols="12"
               align="center"
@@ -649,7 +652,9 @@
               <h4>Your transaction is waiting to get approved on the blockchain.</h4>
             </v-col>
           </v-row>
-          <v-row v-if="step4">
+          <v-row v-if="step4"
+            class="carmenBold"
+            >
             <v-col
               cols="12"
               align="center"

diff --git a/stores/data.js b/stores/data.js
@@ -48,6 +48,7 @@ export const useAppStore = defineStore('app', {
     validatorDelegations: '',
     validatorUnDelegations: '',
     myAddressBook: [],
+    dataLoaded: false,
   }),
   actions: {
     async refresh() {
@@ -64,6 +65,7 @@ export const useAppStore = defineStore('app', {
       await this.getGovModule()
       await this.getDelegations()
       await this.getAddressBook()
+      this.dataLoaded = true
     },
     setChainId(chainId) {
       this.chainSelected = chainId