From 4061dd960235d6b584349246099be8980cbcb8c3 Mon Sep 17 00:00:00 2001 From: liuqiang Date: Fri, 31 Jul 2020 15:46:57 +0800 Subject: [PATCH 1/5] show error message if file is not selected while importing dat file --- src/components/JsonWallet/Import/BasicInfo.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/JsonWallet/Import/BasicInfo.vue b/src/components/JsonWallet/Import/BasicInfo.vue index a0d4b44..5e8c4ff 100644 --- 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() From f89986bcbdba105a827ef5910db6408628ff58d8 Mon Sep 17 00:00:00 2001 From: liuqiang Date: Fri, 31 Jul 2020 17:13:16 +0800 Subject: [PATCH 2/5] edit button text for redeem claimable stake and add claimable stake to the page --- src/components/Node/NodeStake/NodeStakeInfo.vue | 4 ++++ src/lang/en.js | 3 ++- src/lang/zh.js | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/components/Node/NodeStake/NodeStakeInfo.vue b/src/components/Node/NodeStake/NodeStakeInfo.vue index 0914df4..f5b8e8e 100644 --- a/src/components/Node/NodeStake/NodeStakeInfo.vue +++ b/src/components/Node/NodeStake/NodeStakeInfo.vue @@ -114,6 +114,10 @@

{{$t('nodeStake.stakeQuantity')}}

{{current_peer.initPos}}

+
+

{{$t('nodeStake.claimableQuantity')}}

+

{{authorizationInfo.claimable}}

+
{{$t('nodeMgmt.addInitPos')}} diff --git a/src/lang/en.js b/src/lang/en.js index 8ffbf73..6e96c6f 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -475,6 +475,7 @@ export default { contract: 'Contract', commitmentQuantity: 'Commitment Quantity', stakeQuantity: 'Stake Quantity', + claimableQuantity: 'Claimable Quantity', 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 index 78aa02e..59b6808 100644 --- 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: '没有可提取的初始质押。', From 857d668babad892c84ca73dc4fa0ad89ffdc0fa3 Mon Sep 17 00:00:00 2001 From: liuqiang Date: Fri, 31 Jul 2020 17:16:09 +0800 Subject: [PATCH 3/5] change help link for cn to be same as en --- src/components/TopLeftNav.vue | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/components/TopLeftNav.vue b/src/components/TopLeftNav.vue index 02663ce..a280831 100644 --- a/src/components/TopLeftNav.vue +++ b/src/components/TopLeftNav.vue @@ -61,17 +61,7 @@ export default { }, methods: { toHelp() { - const lang = localStorage.getItem("user_lang"); - let url = ""; - if (lang === "zh") { - url = "http://ontfans.io/article/41.html"; - // url = 'https://medium.com/ontologynetwork/owallet-faq-7f4f96784253' - } else { - // url = 'https://ontfans.io/?/article/39' - url = "https://medium.com/ontologynetwork/owallet-faq-7f4f96784253"; - } - - open(url) + open("https://medium.com/ontologynetwork/owallet-faq-7f4f96784253") } } }; From bf0fa7d33a78cc3a7d2c5816a46c04f193ac32e1 Mon Sep 17 00:00:00 2001 From: liuqiang Date: Fri, 31 Jul 2020 17:25:47 +0800 Subject: [PATCH 4/5] change quantity to amount --- src/lang/en.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lang/en.js b/src/lang/en.js index 6e96c6f..62b4875 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -473,9 +473,9 @@ export default { stakeWalletAddress: 'Stake Wallet Address', nodePk: 'Node Public Key', contract: 'Contract', - commitmentQuantity: 'Commitment Quantity', - stakeQuantity: 'Stake Quantity', - claimableQuantity: 'Claimable Quantity', + commitmentQuantity: 'Commitment Amount', + stakeQuantity: 'Stake Amount', + claimableQuantity: 'Claimable Amount', stake: 'Stake', feeTip: 'Stake needs 500 ONG for service fee', selectOntid: 'Select ONT ID', From 3bd3ead00a2e59ab4ca07533cd145d17003177b9 Mon Sep 17 00:00:00 2001 From: liuqiang Date: Mon, 3 Aug 2020 10:09:48 +0800 Subject: [PATCH 5/5] Revert "change help link for cn to be same as en" and update link --- src/components/TopLeftNav.vue | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/components/TopLeftNav.vue b/src/components/TopLeftNav.vue index a280831..558b3d6 100644 --- a/src/components/TopLeftNav.vue +++ b/src/components/TopLeftNav.vue @@ -61,7 +61,17 @@ export default { }, methods: { toHelp() { - open("https://medium.com/ontologynetwork/owallet-faq-7f4f96784253") + const lang = localStorage.getItem("user_lang"); + let url = ""; + if (lang === "zh") { + url = "https://medium.com/ontology-cn/owallet常见问题-d1b397c11662"; + // url = 'https://medium.com/ontologynetwork/owallet-faq-7f4f96784253' + } else { + // url = 'https://ontfans.io/?/article/39' + url = "https://medium.com/ontologynetwork/owallet-faq-7f4f96784253"; + } + + open(url) } } };