From a8cf946f761077987f105cff2f0272cee9292c78 Mon Sep 17 00:00:00 2001
From: Alicia Sykes <sykes.alicia@gmail.com>
Date: Fri, 20 Aug 2021 00:36:38 +0100
Subject: [PATCH] :ambulance: [67174449] Fixes version checking

---
 src/components/Configuration/AppVersion.vue | 14 +++++++++++++-
 vue.config.js                               |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/components/Configuration/AppVersion.vue b/src/components/Configuration/AppVersion.vue
index 698e8a8394..6894136162 100644
--- a/src/components/Configuration/AppVersion.vue
+++ b/src/components/Configuration/AppVersion.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-version">
+  <div class="app-version" v-if="isVersionValid()">
     <!-- Current Version -->
     <p>
       {{ $t('updates.app-version-note') }} {{ appVersion }}
@@ -31,6 +31,7 @@
 
 <script>
 import axios from 'axios';
+import ErrorHandler from '@/utils/ErrorHandler';
 
 export default {
   name: 'AppInfoModal',
@@ -76,6 +77,17 @@ export default {
       if (difference > 5) this.veryOutOfDate = true;
       return difference <= 0;
     },
+    /* Checks that the input version is correctly parsed */
+    isVersionValid() {
+      const isValid = !Number.isNaN(parseInt(this.appVersion.replaceAll('.', ''), 10));
+      if (!isValid) { // If invalid, then record an error
+        ErrorHandler(
+          'Unable to check for updates, because current version is unavailible.'
+          + ` ${this.appVersion} is not a valid version.`,
+        );
+      }
+      return isValid;
+    },
   },
 };
 </script>
diff --git a/vue.config.js b/vue.config.js
index 7b9295a789..a25d45195a 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -5,7 +5,7 @@
 const ProgressBarPlugin = require('progress-bar-webpack-plugin');
 
 // Get current version
-process.env.VUE_APP_VERSION = require('./package.json');
+process.env.VUE_APP_VERSION = require('./package.json').version;
 
 // Specify and export the main Vue app config
 module.exports = {