chore: Refactoring to reuse already defined constants

7 files changed, 16 insertions, 16 deletions

diff --git a/src/api/server/ServerApi.js b/src/api/server/ServerApi.js
index bc0b0dff9..a55997b9d 100644
--- a/src/api/server/ServerApi.js
+++ b/src/api/server/ServerApi.js
@@ -1,7 +1,7 @@
 import { join } from 'path';
 import tar from 'tar';
 import { readdirSync, statSync, writeFileSync, copySync, ensureDirSync, pathExistsSync, readJsonSync, removeSync } from 'fs-extra';
-import { app, require as remoteRequire } from '@electron/remote';
+import { require as remoteRequire } from '@electron/remote';
 
 import ServiceModel from '../../models/Service';
 import RecipePreviewModel from '../../models/RecipePreview';
@@ -13,7 +13,7 @@ import OrderModel from '../../models/Order';
 import { sleep } from '../../helpers/async-helpers';
 
 import { SERVER_NOT_LOADED } from '../../config';
-import { osArch, osPlatform, asarRecipesPath, userDataRecipesPath, userDataPath } from '../../environment';
+import { osArch, osPlatform, asarRecipesPath, userDataRecipesPath, userDataPath, ferdiVersion } from '../../environment';
 import apiBase from '../apiBase';
 import { prepareAuthRequest, sendAuthRequest } from '../utils/auth';
 
@@ -435,9 +435,7 @@ export default class ServerApi {
 
   // News
   async getLatestNews() {
-    const url = `${apiBase(
-      true,
-    )}/news?platform=${osPlatform}&arch=${osArch}&version=${app.getVersion()}`;
+    const url = `${apiBase(true)}/news?platform=${osPlatform}&arch=${osArch}&version=${ferdiVersion}`;
     const request = await sendAuthRequest(url);
     if (!request.ok) throw request;
     const data = await request.json();
diff --git a/src/api/utils/auth.js b/src/api/utils/auth.js
index 9f718f171..e493b2962 100644
--- a/src/api/utils/auth.js
+++ b/src/api/utils/auth.js
@@ -1,5 +1,5 @@
-import { app } from '@electron/remote';
 import localStorage from 'mobx-localstorage';
+import { ferdiLocale, ferdiVersion } from '../../environment';
 
 export const prepareAuthRequest = (options = { method: 'GET' }, auth = true) => {
   const request = Object.assign(options, {
@@ -7,10 +7,10 @@ export const prepareAuthRequest = (options = { method: 'GET' }, auth = true) =>
     headers: {
       'Content-Type': 'application/json',
       'X-Franz-Source': 'desktop',
-      'X-Franz-Version': app.getVersion(),
+      'X-Franz-Version': ferdiVersion,
       'X-Franz-platform': process.platform,
       'X-Franz-Timezone-Offset': new Date().getTimezoneOffset(),
-      'X-Franz-System-Locale': app.getLocale(),
+      'X-Franz-System-Locale': ferdiLocale,
       ...options.headers,
     },
   });
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 87a4ada27..9db434099 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -1,4 +1,4 @@
-import { app, systemPreferences } from '@electron/remote';
+import { systemPreferences } from '@electron/remote';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
@@ -16,7 +16,7 @@ import {
   FRANZ_TRANSLATION,
   GITHUB_FRANZ_URL,
 } from '../../../config';
-import { DEFAULT_APP_SETTINGS, isMac, isWindows, lockFerdiShortcutKey } from '../../../environment';
+import { DEFAULT_APP_SETTINGS, ferdiVersion, isMac, isWindows, lockFerdiShortcutKey } from '../../../environment';
 import globalMessages from '../../../i18n/globalMessages';
 
 const messages = defineMessages({
@@ -669,7 +669,7 @@ export default @observer class EditSettingsForm extends Component {
               )}
               {intl.formatMessage(messages.currentVersion)}
               {' '}
-              {app.getVersion()}
+              {ferdiVersion}
               {noUpdateAvailable && (
               <>
                 <br />
diff --git a/src/environment.js b/src/environment.js
index 42c6b2927..f2a889be4 100644
--- a/src/environment.js
+++ b/src/environment.js
@@ -31,6 +31,7 @@ export const ferdiVersion = app.getVersion();
 export const electronVersion = process.versions.electron;
 export const chromeVersion = process.versions.chrome;
 export const nodeVersion = process.versions.node;
+export const ferdiLocale = app.getLocale();
 
 // Set app directory before loading user modules
 if (process.env.FERDI_APPDATA_DIR != null) {
diff --git a/src/features/announcements/api.js b/src/features/announcements/api.js
index a7fe24bb1..962f3e694 100644
--- a/src/features/announcements/api.js
+++ b/src/features/announcements/api.js
@@ -1,14 +1,14 @@
-import { app } from '@electron/remote';
 import Request from '../../stores/lib/Request';
 import apiBase from '../../api/apiBase';
 import { GITHUB_FERDI_REPO_NAME, GITHUB_NIGHTLIES_REPO_NAME, GITHUB_ORG_NAME } from '../../config';
+import { ferdiVersion } from '../../environment';
 
 const debug = require('debug')('Ferdi:feature:announcements:api');
 
 export const announcementsApi = {
   async getCurrentVersion() {
     debug('getting current version of electron app');
-    return Promise.resolve(app.getVersion());
+    return Promise.resolve(ferdiVersion);
   },
 
   async getChangelog(version) {
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 1d706f1ef..180f01af6 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -24,6 +24,7 @@ import {
   electronVersion,
   osRelease,
   userDataPath,
+  ferdiLocale,
 } from '../environment';
 import locales from '../i18n/translations';
 import { onVisibilityChange } from '../helpers/visibility-helper';
@@ -509,7 +510,7 @@ export default class AppStore extends Store {
 
   _getDefaultLocale() {
     return getLocale({
-      locale: app.getLocale(),
+      locale: ferdiLocale,
       locales,
       defaultLocale,
       fallbackLocale: DEFAULT_APP_SETTINGS.fallbackLocale,
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 4ccb995ae..2ec6a0a68 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -2,7 +2,6 @@ import { shell } from 'electron';
 import { action, reaction, computed, observable } from 'mobx';
 import { debounce, remove } from 'lodash';
 import ms from 'ms';
-import { app } from '@electron/remote';
 import { ensureFileSync, pathExistsSync, writeFileSync } from 'fs-extra';
 import { join } from 'path';
 
@@ -18,6 +17,7 @@ import {
 import { workspaceStore } from '../features/workspaces';
 import { KEEP_WS_LOADED_USID } from '../config';
 import { SPELLCHECKER_LOCALES } from '../i18n/languages';
+import { ferdiVersion } from '../environment';
 
 const debug = require('debug')('Ferdi:ServiceStore');
 
@@ -1149,7 +1149,7 @@ export default class ServicesStore extends Store {
         'initialize-recipe',
         {
           ...shareWithWebview,
-          franzVersion: app.getVersion(),
+          franzVersion: ferdiVersion,
         },
         service.recipe,
       );