Merge pull request #39 from hypersign-protocol/ui-bugs

fix ui bugs

Author: Pratap2018

src/components/deploy-onchain-kyc-popup/deploy-kyc.vue

@@ -459,6 +459,7 @@ export default {
                 if (this.masterWalletFundTxStatus && this.masterWalletFundTxStatus.status == 200) {
                     this.notifySuccess('Successfully created master wallet')
                 } else {
+                    this.masterWalletFundTxStatus = null
                     throw new Error('Could fund issuer wallet account ')
                 }
                 await this.createAppsOnChainConfig({

src/components/deploy-onchain-kyc-popup/finish.vue

@@ -1,18 +1,30 @@
 <template>
     <div class="container">
-
         <div class="row card-body card">
             <div class="col mt-1">
                 <div>
                     <div class="circleBase type1 mx-1"><i class="fa fa-check"></i></div> Wallet Connected
                 </div>
             </div>
-            <div class="col mt-1">
+            <div class="col mt-1" v-if="getBlockchainUser().blockchain == 'diam'">
+                <div>
+                    <div class="circleBase type1 mx-1"><i class="fa fa-check"></i></div> Issuer Wallet Created
+                </div>
+            </div>
+
+            <div class="col mt-1" v-else>
                 <div>
                     <div class="circleBase type1 mx-1"><i class="fa fa-check"></i></div> KYC Contract deployed
                 </div>
             </div>
-            <div class="col mt-1">
+            <div class="col mt-1" v-if="getBlockchainUser().blockchain == 'diam'">
+                <div>
+                    <div class="circleBase type1 mx-1"><i class="fa fa-check"></i></div> Issuer Wallet Funded
+                </div>
+            </div>
+
+
+            <div class="col mt-1" v-else>
                 <div>
                     <div class="circleBase type1 mx-1"><i class="fa fa-check"></i></div> SBT Contract deployed
                 </div>
@@ -52,10 +64,12 @@
 
 <script>
 import { mapMutations, mapActions } from "vuex";
+import { mapGetters } from "vuex/dist/vuex.common.js";
 
 export default {
     name: 'FinishOnchainKyc',
     methods: {
+        ...mapGetters('walletStore', ['getOnChainBlockchainLabel', 'getBlockchainUser']),
         ...mapMutations('walletStore', ['resetAll', 'nextStep']),
         ...mapActions('mainStore', ['fetchAppsOnChainConfigs']),
         close() {

src/views/playground/OnChainKycSystems.vue

@@ -160,6 +160,9 @@ h5 span {
               <th class="sticky-header">ID</th>
               <th class="sticky-header">Date</th>
               <th class="sticky-header">Issuer DID</th>
+              <th class="sticky-header">Issuer Wallet</th>
+
+
               <!-- <th class="sticky-header">Owner's Wallet</th> -->
               <th class="sticky-header">KYC Contract</th>
               <!-- <th class="sticky-header">KYC Tx Hash</th> -->
@@ -187,8 +190,10 @@ h5 span {
               </td>
               <td @click="copyToClip(row.issuerDid, 'Issuer DID')" style="cursor: pointer;">{{
                 stringShortner(row.issuerDid, 15) }}</td>
-              <!-- <td @click="copyToClip(row.walletAddress, 'Wallet Address')" style="cursor: pointer;">{{
-                stringShortner(row.walletAddress, 15) }}</td> -->
+              <td @click="copyToClip(row.options?.masterWalletAddress, 'Wallet Address')" style="cursor: pointer;">{{
+                stringShortner(row.options?.masterWalletAddress, 15) }}</td>
+
+
               <td @click="copyToClip(row.kycContractAddress, 'Kyc Contract Address')" style="cursor: pointer;">{{
                 stringShortner(row.kycContractAddress, 20) }}</td>
               <!-- <td @click="copyToClip(row.kycContractTxHash, 'Kyc Contract Tx Hash')" style="cursor: pointer;"><a
@@ -214,7 +219,8 @@ h5 span {
 
     <StudioSideBar title="OnChain KYC">
       <div class="container" style="width: 100%;">
-        <DeployOnChainKYC />
+        <!-- sliderKey is added to enure force rendering when DeployOnChainKyc is Called -->
+        <DeployOnChainKYC :key="sliderKey" />
       </div>
     </StudioSideBar>
   </div>
@@ -252,6 +258,8 @@ export default {
       user: {},
       fullPage: true,
       isLoading: false,
+      // force render 
+      sliderKey: 0,
     }
   },
 
@@ -311,6 +319,8 @@ export default {
       this.$root.$emit("bv::toggle::collapse", "sidebar-right");
     },
     openSlider() {
+      // force render every time the slider is open
+      this.sliderKey = this.sliderKey + 1
       this.edit = false;
       this.setOnChainConfig({});
       this.$root.$emit("bv::toggle::collapse", "sidebar-right");
@@ -320,9 +330,7 @@ export default {
       if (blockchainlabel.indexOf('cosmos') >= 0) {
         config = getCosmosChainConfig(blockchainlabel)
       } else {
-        console.log({
-          blockchainlabel
-        })
+
         config = getStellarChainConfig(blockchainlabel)
       }
 

src/views/playground/WidgetConfig/Index.vue

@@ -214,14 +214,18 @@ ul {
                   <div class="">
                     <div class="">
                       <label for=""><strong>Select Proof Type: </strong></label>
-                      <b-form-select class="col-md-10" v-model="slectProof" :options="proofTypeOptions"
-                        size=""></b-form-select>
-                      <span class="col-md-1" style="margin-left:0px">
-                        <HfButtons name="" customClass="btn btn-outline-secondary" iconClass="fa fa-plus"
-                          @executeAction="addZkProof(selectedProofData.value, selectedProofData.criteriaValue)">
-                        </HfButtons>
-                      </span>
+                      <div class="input-group">
+
+                        <b-form-select class="col-md-11 col-11 col-sm-11 col-lg-11 col-xl-11" v-model="slectProof" :options="proofTypeOptions"
+                          size=""></b-form-select>
+                        <span class="col-md-1 col-1 col-sm-1 col-lg-1 col-xl-1" style="margin-left:0px">
+                          <HfButtons name="" customClass="btn btn-outline-secondary" iconClass="fa fa-plus"
+                            @executeAction="addZkProof(selectedProofData.value, selectedProofData.criteriaValue)">
+                          </HfButtons>
+                        </span>
+
 
+                      </div>
                     </div>
                     <div class="row" v-if="selectedProofData.criteria">
                       <div class="col">