From 77ee6be218132463b161be926fbc6306acc0fa48 Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Mon, 2 Mar 2020 22:35:34 +0100
Subject: [PATCH] Fix getting extension version in the popup

---
 src/ext/lib/Settings.js         | 9 +++++----
 src/options/about.vue           | 4 +++-
 src/popup/panels/AboutPanel.vue | 6 ------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/ext/lib/Settings.js b/src/ext/lib/Settings.js
index 1fbf66f..a145867 100644
--- a/src/ext/lib/Settings.js
+++ b/src/ext/lib/Settings.js
@@ -52,14 +52,15 @@ class Settings {
     }
   }
 
-  getExtensionVersion() {
+  static getExtensionVersion() {
     if (currentBrowser.firefox) {
       return browser.runtime.getManifest().version;
     } else if (currentBrowser.chrome) {
       return chrome.runtime.getManifest().version;
-    } else if (currentBrowser.edge) {
-      return browser.runtime.getManifest().version;
-    }
+    } 
+  }
+  getExtensionVersion() {
+    return Settings.getExtensionVersion(); 
   }
 
   compareExtensionVersions(a, b) {
diff --git a/src/options/about.vue b/src/options/about.vue
index 66d48e2..5f14955 100644
--- a/src/options/about.vue
+++ b/src/options/about.vue
@@ -33,10 +33,12 @@
 
 <script>
 import BrowserDetect from '../ext/conf/BrowserDetect';
+import Settings from '../ext/lib/Settings';
+
 export default {
   data() {
     return {
-      addonVersion: browser.runtime.getManifest().version || chrome.runtime.getManifest().version,
+      addonVersion: Settings.getVersion(),
       mailtoLink: 'mailto:tamius.han@gmail.com',
       redditLink: '',
     }
diff --git a/src/popup/panels/AboutPanel.vue b/src/popup/panels/AboutPanel.vue
index 46a3ebb..69801da 100644
--- a/src/popup/panels/AboutPanel.vue
+++ b/src/popup/panels/AboutPanel.vue
@@ -48,12 +48,6 @@ export default {
   data() {
     return {
       addonVersion: browser.runtime.getManifest().version || chrome.runtime.getManifest().version,
-      mailtoLink: 'mailto:tamius.han@gmail.com',
-      redditLink: '',
-    }
-  },
-  data() {
-    return {
       loggingEnabled: false,
       loggerSettings: '',
       loggerSettingsError: false,