Merge branch 'develop' into fabo/1911-add-sentry-version

luniehq · Feb 14, 2019 · ddd6906 · ddd6906
2 parents e7609f1 + a197125
commit ddd6906
Show file tree

Hide file tree

Showing 9 changed files with 713 additions and 560 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -68,6 +68,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - [\#1918](https://github.com/cosmos/voyager/issues/1918) added message to log in when sending transactions and the user is not authenticated @fedekunze
 - [\#1866](https://github.com/cosmos/voyager/issues/1866) Added blocks to network page and a page for viewing individual blocks @jbibla
 - [\#1911](https://github.com/cosmos/voyager/issues/1911) Upload code to Sentry for remote error analyzer @faboweb
+- Added development mode warning @faboweb
 
 ### Changed
 
@@ -198,6 +199,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - HOT FIX: unit tests failed due to merge @faboweb
 - HOT FIX: we fixed develop (replaced contenthash with hash) @jbibla
 - Bring back devMode @faboweb
+- [\#1945](https://github.com/cosmos/voyager/issues/1945) Fixed governance parameters quorum description @fedekunze
+- [\#1978](https://github.com/cosmos/voyager/pull/1978) Fixed dependency for security audit @sabau
 
 ## [0.10.7] - 2018-10-10
 

diff --git a/app/src/renderer/App.vue b/app/src/renderer/App.vue
@@ -1,5 +1,6 @@
 <template>
   <div id="app">
+    <div v-if="config.devMode" id="develop-mode-warning">DEVELOPMENT MODE</div>
     <modal-help />
     <session v-if="config.modals.session.active" />
     <onboarding v-else-if="onboarding.active" />

diff --git a/app/src/renderer/components/governance/TabParameters.vue b/app/src/renderer/components/governance/TabParameters.vue
@@ -117,7 +117,9 @@
             <dd>
               {{
                 governanceParameters.parameters.tallying.quorum
-                  ? governanceParameters.parameters.tallying.quorum
+                  ? `${parseFloat(
+                      governanceParameters.parameters.tallying.quorum
+                    ) * 100} %`
                   : `n/a`
               }}
             </dd>
@@ -179,7 +181,8 @@ export default {
       description: `Tally parameters for governance in the Cosmos Hub`,
       threshold: `Percentage of "Yes" votes required for proposal to pass`,
       veto: `Percentage of "No With Veto" votes required for proposal to be vetoed`,
-      governance_penalty: `Penalty for a validator who fails to vote`
+      governance_penalty: `Penalty for a validator who fails to vote`,
+      quorum: `Percentage of tokens required to vote on a proposal to be considered valid`
     },
     votingTooltips: {
       description: `Voting parameters for governance in the Cosmos Hub`,

diff --git a/app/src/renderer/connectors/lcdClientMock.js b/app/src/renderer/connectors/lcdClientMock.js
@@ -323,6 +323,7 @@ const state = {
     tallying: {
       threshold: `0.5000000000`,
       veto: `0.3340000000`,
+      quorum: `0.3340000000`,
       governance_penalty: `0.0100000000`
     },
     voting: {

diff --git a/app/src/renderer/styles/app.css b/app/src/renderer/styles/app.css
@@ -118,3 +118,14 @@ input.tm-field {
 .desktop-only {
   display: inline;
 }
+
+#develop-mode-warning {
+  background: red;
+  text-align: center;
+  height: 2.5rem;
+  padding: 0.5rem;
+  position: fixed;
+  z-index: 1000000;
+  width: 100%;
+  top: 0;
+}
diff --git a/package.json b/package.json
@@ -75,7 +75,7 @@
     "html-webpack-plugin": "3.2.0",
     "http-server": "0.11.1",
     "husky": "0.14.3",
-    "jest": "23.6.0",
+    "jest": "24.1.0",
     "jest-localstorage-mock": "2.3.0",
     "jsdoc": "3.5.5",
     "jsdoc-vuejs": "2.3.3",

diff --git a/test/unit/specs/components/common/__snapshots__/TmOnboarding.spec.js.snap b/test/unit/specs/components/common/__snapshots__/TmOnboarding.spec.js.snap
@@ -36,7 +36,7 @@ exports[`TmOnboarding has the expected html structure 0 1`] = `
         </div>
          
         <img
-          src="function() {
+          src="function mockConstructor() {
         return fn.apply(this, arguments);
       }"
         />
@@ -154,7 +154,7 @@ exports[`TmOnboarding has the expected html structure 1 1`] = `
         </div>
          
         <img
-          src="function() {
+          src="function mockConstructor() {
         return fn.apply(this, arguments);
       }"
         />
@@ -272,7 +272,7 @@ exports[`TmOnboarding has the expected html structure 2 1`] = `
         </div>
          
         <img
-          src="function() {
+          src="function mockConstructor() {
         return fn.apply(this, arguments);
       }"
         />
@@ -390,7 +390,7 @@ exports[`TmOnboarding has the expected html structure 3 1`] = `
         </div>
          
         <img
-          src="function() {
+          src="function mockConstructor() {
         return fn.apply(this, arguments);
       }"
         />
@@ -508,7 +508,7 @@ exports[`TmOnboarding has the expected html structure 4 1`] = `
         </div>
          
         <img
-          src="function() {
+          src="function mockConstructor() {
         return fn.apply(this, arguments);
       }"
         />

diff --git a/test/unit/specs/components/governance/__snapshots__/TabParameters.spec.js.snap b/test/unit/specs/components/governance/__snapshots__/TabParameters.spec.js.snap
@@ -152,7 +152,7 @@ exports[`TabParameters has the expected html structure 1`] = `
            
           <dd>
             
-            n/a
+            33.4 %
           
           </dd>
         </dl>
-Original file line number
+Diff line change
@@ Expand Up @@
               <dd>
-                n/a
+.4 %
               </dd>
             </dl>
@@ Expand Down @@