Merge branch 'develop' into release-candidate/v1.0.0-beta.19

luniehq · Mar 15, 2019 · 6f8fe87 · 6f8fe87
2 parents 2fe7fca + 399e379
commit 6f8fe87
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/...r/components/governance/TabParameters.vue → ...ts/governance/TabGovernanceParameters.vue b/...r/components/governance/TabParameters.vue → ...ts/governance/TabGovernanceParameters.vue
@@ -24,7 +24,7 @@
         </div>
         <div class="column">
           <dl class="info_dl">
-            <dt v-tooltip.top="depositTooltips.max_deposit_period">
+            <dt>
               Maximum Deposit Period
               <i
                 v-tooltip.top="depositTooltips.max_deposit_period"
@@ -139,7 +139,7 @@
 import { mapGetters } from "vuex"
 import { atoms } from "../../scripts/num.js"
 export default {
-  name: `tab-staking-parameters`,
+  name: `tab-governance-parameters`,
   data: () => ({
     atoms,
     depositTooltips: {

diff --git a/app/src/renderer/routes.js b/app/src/renderer/routes.js
@@ -21,7 +21,7 @@ export default [
       {
         path: `governance-parameters`,
         name: `Governance Parameters`,
-        component: require(`./components/governance/TabParameters`).default
+        component: require(`./components/governance/TabGovernanceParameters`).default
       }
     ]
   },

diff --git a/package.json b/package.json
@@ -43,7 +43,7 @@
     "frontend:fixed-https": "yarn frontend --cert 'server_dev.crt' --key 'server_dev.key'",
     "connect": "concurrently -k \"yarn stargate\" \"yarn proxy\"",
     "backend:new": "concurrently -k \"yarn connect\" \"yarn nodes 2\"",
-    "backend": "concurrently -k \"yarn yarn connect\" \"yarn nodes 2 skip-rebuild\"",
+    "backend": "concurrently -k \"yarn connect\" \"yarn nodes 2 skip-rebuild\"",
     "backend:fixed-https": "concurrently -k \"yarn nodes 2 skip-rebuild\" \"yarn stargate --ssl-certfile 'server_dev.crt' --ssl-keyfile 'server_dev.key'\""
   },
   "devDependencies": {

diff --git a/...mponents/governance/TabParameters.spec.js → ...overnance/TabGovernanceParameters.spec.js b/...mponents/governance/TabParameters.spec.js → ...overnance/TabGovernanceParameters.spec.js
@@ -1,11 +1,11 @@
 import Vuelidate from "vuelidate"
 import setup from "../../../helpers/vuex-setup"
-import TabParameters from "renderer/components/governance/TabParameters"
+import TabGovernanceParameters from "renderer/components/governance/TabGovernanceParameters"
 import lcdClientMock from "renderer/connectors/lcdClientMock.js"
 
 const { governanceParameters, stakingParameters } = lcdClientMock.state
 
-describe(`TabParameters`, () => {
+describe(`TabGovernanceParameters`, () => {
   let wrapper, store
   const { mount, localVue } = setup()
   localVue.use(Vuelidate)
@@ -23,7 +23,7 @@ describe(`TabParameters`, () => {
   }
 
   beforeEach(() => {
-    const instance = mount(TabParameters, {
+    const instance = mount(TabGovernanceParameters, {
       localVue,
       doBefore: ({ store }) => {
         store.commit(`setGovParameters`, governanceParameters)

diff --git a/.../__snapshots__/TabParameters.spec.js.snap → ...ts__/TabGovernanceParameters.spec.js.snap b/.../__snapshots__/TabParameters.spec.js.snap → ...ts__/TabGovernanceParameters.spec.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`TabParameters has the expected html structure 1`] = `
+exports[`TabGovernanceParameters has the expected html structure 1`] = `
 <div>
   <div
     class="parameters__details parameters__section"