display version numbers in builds

CHANGELOG.md

@@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 * updated tendermint/ui to fix min max override in page send @okwme
 * removed unused xmlhttprequest dependency @faboweb
 * LCD staking endpoints @fedekunze @faboweb
+* the way we show version numbers in the version modal @jbibla
 
 ### Added
 

README.md

@@ -101,15 +101,17 @@ First [Build Gaia](#build-gaia) and [Download the testnet configurations](#downl
 Here's an example build command:
 
 ```bash
-yarn run build --commit=HEAD --network=gaia-7001
+yarn run build --commit=HEAD --network=gaia-7005
 ```
 
 You can specify `--help` to see all options with explanations.
 
-Run the app.
+To unzip the app:
 
 ```bash
-open builds/Cosmos-{platform}-x64/Cosmos.app
+open builds/Voyager/Cosmos_Voyager-v0.9.4-Linux.tar.gz
+open builds/Voyager/Cosmos_Voyager-v0.9.4-macOS.zip
+open builds/Voyager/Cosmos_Voyager-v0.9.4-Windows.zip
 ```
 
 To test if your build worked run:

app/src/main/index.js

@@ -47,6 +47,11 @@ const MOCK =
     ? JSON.parse(process.env.COSMOS_MOCKED)
     : false
 global.config.mocked = MOCK // persist resolved mock setting also in config used by view thread
+const gaiaVersion = fs
+  .readFileSync(networkPath + "/gaiaversion.txt")
+  .toString()
+  .split("-")[0]
+process.env.GAIA_VERSION = gaiaVersion
 
 let LCD_BINARY_NAME = "gaiacli" + (WIN ? ".exe" : "")
 

app/src/renderer/components/common/PagePreferences.vue

@@ -5,9 +5,9 @@ tm-page(title="Preferences")
   tm-modal(:close="setAbout", v-if="showAbout")
     div(slot="title") About Cosmos Voyager
     .about-popup
-      img( src="~@/assets/images/onboarding/step-0.png")
-      div Voyager v{{versionVoyager}}
-      div Cosmos SDK v{{versionSDK}}
+      img(src="~@/assets/images/onboarding/step-0.png")
+      div(v-if="voyagerVersion") Voyager {{voyagerVersion}}
+      div(v-if="gaiaVersion") Cosmos SDK {{gaiaVersion}}
 
   tm-part(title='Settings')
     tm-list-item(type="field" title="Select network to connect to")
@@ -54,6 +54,7 @@ tm-page(title="Preferences")
 <script>
 import { mapGetters, mapMutations } from "vuex"
 import { TmListItem, TmBtn, TmPage, TmPart, TmField } from "@tendermint/ui"
+import { remote } from "electron"
 import ToolBar from "common/TmToolBar"
 import TmModal from "common/TmModal"
 
@@ -78,12 +79,15 @@ export default {
     ]),
     showAbout() {
       return this.config.showAbout
+    },
+    voyagerVersion() {
+      return remote.app.getVersion()
+    },
+    gaiaVersion() {
+      return process.env.GAIA_VERSION
     }
   },
-
   data: () => ({
-    versionVoyager: null,
-    versionSDK: null,
     themeSelectActive: null,
     themeSelectOptions: [
       {
@@ -110,8 +114,6 @@ export default {
   mounted() {
     this.networkSelectActive = this.mockedConnector ? "mock" : "live"
     this.themeSelectActive = this.themes.active
-    this.versionSDK = process.env.GAIA_VERSION.split("-").shift()
-    this.versionVoyager = process.env.VOYAGER_VERSION
   },
   methods: {
     ...mapMutations(["setAbout"]),

tasks/runner.js

@@ -78,6 +78,7 @@ module.exports = async function(networkPath) {
   const gaiaVersion = fs
     .readFileSync(networkPath + "gaiaversion.txt")
     .toString()
+    .split("-")[0]
   let env = Object.assign(
     {},
     {

test/unit/helpers/electron_mock.js

@@ -15,6 +15,9 @@ jest.mock("electron", () => ({
             "https://4dee9f70a7d94cc0959a265c45902d84@sentry.io/288169"
         }
       if (name === "root") return "./test/unit/tmp/test_root/"
+    },
+    app: {
+      getVersion: jest.fn(() => "0.5.5")
     }
   }
 }))

test/unit/helpers/genesis_mock.js

@@ -4,7 +4,7 @@ let testRoot = "./test/unit/tmp/test_root/"
 
 function mockGenesis() {
   process.env.COSMOS_NETWORK = "./networks/gaiaiaiaiaiaia/"
-  process.env.GAIA_VERSION = "1.2.3-asdf"
+  process.env.GAIA_VERSION = "1.2.3"
   process.env.VOYAGER_VERSION = "3.6.9"
   process.env.COSMOS_HOME = testRoot
   fs.ensureFileSync(testRoot + "genesis.json")

test/unit/specs/components/common/PagePreferences.spec.js

@@ -105,10 +105,10 @@ describe("PagePreferences", () => {
     wrapper.update()
     expect(store.state.config.showAbout).toBe(true)
     expect(wrapper.vm.$el.outerHTML).toContain(
-      "Voyager v" + wrapper.vm.versionVoyager
+      "Voyager " + wrapper.vm.voyagerVersion
     )
     expect(wrapper.vm.$el.outerHTML).toContain(
-      "Cosmos SDK v" + wrapper.vm.versionSDK.split("-").shift()
+      "Cosmos SDK " + wrapper.vm.gaiaVersion
     )
     expect(wrapper.vm.$el).toMatchSnapshot()
     wrapper.vm.setAbout(false)

test/unit/specs/components/common/__snapshots__/PagePreferences.spec.js.snap

@@ -1052,10 +1052,10 @@ exports[`PagePreferences shows versions 2`] = `
               src="~@/assets/images/onboarding/step-0.png"
             />
             <div>
-              Voyager v3.6.9
+              Voyager 0.5.5
             </div>
             <div>
-              Cosmos SDK v1.2.3
+              Cosmos SDK 1.2.3
             </div>
           </div>
         </main>