From 92b59be2227c26adb412227cc7d5100230a47373 Mon Sep 17 00:00:00 2001 From: Jordan Bibla Date: Thu, 14 Mar 2019 20:30:49 -0400 Subject: [PATCH 1/2] too many yarns --- PENDING.md | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/PENDING.md b/PENDING.md index 0ed4303870..570672715c 100644 --- a/PENDING.md +++ b/PENDING.md @@ -6,6 +6,7 @@ - Fix for inflation on our testnet - [\#2257](https://github.com/cosmos/voyager/pull/2257) fixed console error on page validator if loading the page from URL @faboweb +- double yarn in package.json causing error on yarn start @jbibla ### Changed diff --git a/package.json b/package.json index 99d2994e93..3aed4cc271 100644 --- 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": { From 43108b186f97dc030da3e8349b1a1aeea92e5feb Mon Sep 17 00:00:00 2001 From: Fabian Date: Fri, 15 Mar 2019 01:33:17 +0100 Subject: [PATCH 2/2] Fabo/2223 fixed double tooltip (#2266) * renamed tabgovernanceparameters and fixed double tooltip * Update PENDING.md --- PENDING.md | 1 + .../{TabParameters.vue => TabGovernanceParameters.vue} | 4 ++-- app/src/renderer/routes.js | 2 +- ...abParameters.spec.js => TabGovernanceParameters.spec.js} | 6 +++--- ...rs.spec.js.snap => TabGovernanceParameters.spec.js.snap} | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) rename app/src/renderer/components/governance/{TabParameters.vue => TabGovernanceParameters.vue} (98%) rename test/unit/specs/components/governance/{TabParameters.spec.js => TabGovernanceParameters.spec.js} (88%) rename test/unit/specs/components/governance/__snapshots__/{TabParameters.spec.js.snap => TabGovernanceParameters.spec.js.snap} (97%) diff --git a/PENDING.md b/PENDING.md index 0ed4303870..4d02b3a675 100644 --- a/PENDING.md +++ b/PENDING.md @@ -6,6 +6,7 @@ - Fix for inflation on our testnet - [\#2257](https://github.com/cosmos/voyager/pull/2257) fixed console error on page validator if loading the page from URL @faboweb +- [\#2223](https://github.com/cosmos/voyager/issues/2223) Fixed double tooltips on governance parameters tab @faboweb ### Changed diff --git a/app/src/renderer/components/governance/TabParameters.vue b/app/src/renderer/components/governance/TabGovernanceParameters.vue similarity index 98% rename from app/src/renderer/components/governance/TabParameters.vue rename to app/src/renderer/components/governance/TabGovernanceParameters.vue index 5296d9ab02..a95ebf8e95 100644 --- a/app/src/renderer/components/governance/TabParameters.vue +++ b/app/src/renderer/components/governance/TabGovernanceParameters.vue @@ -24,7 +24,7 @@
-
+
Maximum Deposit Period ({ atoms, depositTooltips: { diff --git a/app/src/renderer/routes.js b/app/src/renderer/routes.js index a7c96a14d3..a5532f7300 100644 --- 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/test/unit/specs/components/governance/TabParameters.spec.js b/test/unit/specs/components/governance/TabGovernanceParameters.spec.js similarity index 88% rename from test/unit/specs/components/governance/TabParameters.spec.js rename to test/unit/specs/components/governance/TabGovernanceParameters.spec.js index 9f29b7cef7..e341fc1f84 100644 --- a/test/unit/specs/components/governance/TabParameters.spec.js +++ b/test/unit/specs/components/governance/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/test/unit/specs/components/governance/__snapshots__/TabParameters.spec.js.snap b/test/unit/specs/components/governance/__snapshots__/TabGovernanceParameters.spec.js.snap similarity index 97% rename from test/unit/specs/components/governance/__snapshots__/TabParameters.spec.js.snap rename to test/unit/specs/components/governance/__snapshots__/TabGovernanceParameters.spec.js.snap index c5b677e6bd..b445452e49 100644 --- a/test/unit/specs/components/governance/__snapshots__/TabParameters.spec.js.snap +++ b/test/unit/specs/components/governance/__snapshots__/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`] = `