Unifying apiBase function

3 files changed, 2 insertions, 27 deletions

diff --git a/src/features/announcements/api.js b/src/features/announcements/api.js
index 3cf90fa4a..eadb7dfce 100644
--- a/src/features/announcements/api.js
+++ b/src/features/announcements/api.js
@@ -1,6 +1,6 @@
 import { remote } from 'electron';
 import Request from '../../stores/lib/Request';
-import apiBase from '../apiBase';
+import apiBase from '../../api/apiBase';
 
 const debug = require('debug')('Franz:feature:announcements:api');
 
diff --git a/src/features/apiBase.js b/src/features/apiBase.js
deleted file mode 100644
index d4b092995..000000000
--- a/src/features/apiBase.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Get API base URL from store
- */
-import {
-  API_VERSION,
-  API,
-} from '../environment';
-
-const apiBase = () => {
-  let url;
-  if (!window.ferdi.stores.settings) {
-    // Stores have not yet been loaded - send invalid URL to force a retry when stores are loaded
-    url = 'https://localhost:9999';
-  } else if (window.ferdi.stores.settings.all.app.server) {
-    // Load URL from store
-    url = window.ferdi.stores.settings.all.app.server;
-  } else {
-    // Use default server url
-    url = API;
-  }
-
-  return `${url}/${API_VERSION}`;
-};
-
-export default apiBase;
diff --git a/src/features/workspaces/api.js b/src/features/workspaces/api.js
index 81fd6b65d..b8893363f 100644
--- a/src/features/workspaces/api.js
+++ b/src/features/workspaces/api.js
@@ -2,7 +2,7 @@ import { pick } from 'lodash';
 import { sendAuthRequest } from '../../api/utils/auth';
 import Request from '../../stores/lib/Request';
 import Workspace from './models/Workspace';
-import apiBase from '../apiBase';
+import apiBase from '../../api/apiBase';
 
 const debug = require('debug')('Franz:feature:workspaces:api');