Merge pull request #248 from liuqiang1357/master

fix bugs
ontio · Aug 3, 2020 · 4842059 · 4842059
2 parents 4596fa4 + 3bd3ead
commit 4842059
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/src/components/JsonWallet/Import/BasicInfo.vue b/src/components/JsonWallet/Import/BasicInfo.vue
@@ -318,6 +318,10 @@
             datPassword: this.datPassword,
             datLabel: this.datLabel
           }).then(result => {
+            if (!this.dat) {
+              this.$message.error(this.$t('importJsonWallet.invalidDatFile'))
+              return;
+            }
             if (result) {
               this.$store.dispatch('showLoadingModals')
               this.importAccountForDat()

diff --git a/src/components/Node/NodeStake/NodeStakeInfo.vue b/src/components/Node/NodeStake/NodeStakeInfo.vue
@@ -114,6 +114,10 @@
                 <p class="font-medium-black" for="">{{$t('nodeStake.stakeQuantity')}}</p>
                 <p>{{current_peer.initPos}}</p>
             </div>
+            <div class="detail-item">
+                <p class="font-medium-black" for="">{{$t('nodeStake.claimableQuantity')}}</p>
+                <p>{{authorizationInfo.claimable}}</p>
+            </div>
             <!-- 只有成为节点后可以操作初始质押部分 -->
             <div class="initPos-btns" v-if="detail.status === 8">
                     <a-button class="add-initPos-btn" @click="handleAddInitPos">{{$t('nodeMgmt.addInitPos')}}</a-button>

diff --git a/src/components/TopLeftNav.vue b/src/components/TopLeftNav.vue
@@ -64,7 +64,7 @@ export default {
       const lang = localStorage.getItem("user_lang");
       let url = "";
       if (lang === "zh") {
-        url = "http://ontfans.io/article/41.html";
+        url = "https://medium.com/ontology-cn/owallet常见问题-d1b397c11662";
         // url = 'https://medium.com/ontologynetwork/owallet-faq-7f4f96784253'
       } else {
         // url = 'https://ontfans.io/?/article/39'

diff --git a/src/lang/en.js b/src/lang/en.js
@@ -473,8 +473,9 @@ export default {
     stakeWalletAddress: 'Stake Wallet Address',
     nodePk: 'Node Public Key',
     contract: 'Contract',
-    commitmentQuantity: 'Commitment Quantity',
-    stakeQuantity: 'Stake Quantity',
+    commitmentQuantity: 'Commitment Amount',
+    stakeQuantity: 'Stake Amount',
+    claimableQuantity: 'Claimable Amount',
     stake: 'Stake',
     feeTip: 'Stake needs 500 ONG for service fee',
     selectOntid: 'Select ONT ID',
@@ -626,7 +627,7 @@ Within their 50% share each consensus node will receive their share according to
     getProfitPart: 'Already receiving profit portion',
     newStakePart: 'New stake portion',
     claimableONT: 'Claimable ONT',
-    redeemInitPos: 'Redeem Init Pos',
+    redeemInitPos: 'Redeem claimable stake',
     initPosInLock: "Locked",
     initPosRedeemable: 'Claimable',
     noClaimbleInitPos: 'No claimable ONT.',

diff --git a/src/lang/zh.js b/src/lang/zh.js
@@ -472,6 +472,7 @@ export default {
     contract: '质押合约',
     commitmentQuantity: '承诺质押数量',
     stakeQuantity: '实际质押数量',
+    claimableQuantity: '可提取质押数量',
     stake: '质押',
     feeTip: '质押需要收取500ONG作为服务费',
     selectOntid: '选择ONT ID',
@@ -621,7 +622,7 @@ export default {
     getProfitPart: '产生收益中',
     newStakePart: '新的质押',
     claimableONT: '可提取ONT',
-    redeemInitPos: '提取初始质押',
+    redeemInitPos: '提取可提取质押',
     initPosInLock: "锁定中",
     initPosRedeemable: '可提取',
     noClaimbleInitPos: '没有可提取的初始质押。',