chore: Mobx & React-Router upgrade (#406)

Co-authored-by: Vijay A <vraravam@users.noreply.github.com>

2 files changed, 5 insertions, 2 deletions

diff --git a/src/api/apiBase.ts b/src/api/apiBase.ts
index 918213542..701919785 100644
--- a/src/api/apiBase.ts
+++ b/src/api/apiBase.ts
@@ -23,6 +23,7 @@ export default function apiBase(withVersion = true) {
     // Stores have not yet been loaded - return SERVER_NOT_LOADED to force a retry when stores are loaded
     return SERVER_NOT_LOADED;
   }
+
   const url =
     (window as any).ferdium.stores.settings.all.app.server === LOCAL_SERVER
       ? `http://${LOCAL_HOSTNAME}:${
@@ -34,7 +35,6 @@ export default function apiBase(withVersion = true) {
 };
 
 export function serverBase() {
-
   const serverType = (window as any).ferdium.stores.settings.all.app.server;
   const noServer = 'You are using Ferdium without a server';
 
@@ -54,7 +54,6 @@ export function serverBase() {
 }
 
 export function serverName(): string {
-
   const serverType = (window as any).ferdium.stores.settings.all.app.server;
   const noServer = 'You are using Ferdium without a server';
 
diff --git a/src/api/server/ServerApi.ts b/src/api/server/ServerApi.ts
index a636f3e0d..77a759b3e 100644
--- a/src/api/server/ServerApi.ts
+++ b/src/api/server/ServerApi.ts
@@ -291,6 +291,10 @@ export default class ServerApi {
 
   // Features
   async getDefaultFeatures() {
+    if (apiBase() === SERVER_NOT_LOADED) {
+      throw new Error('Server not loaded');
+    }
+
     const request = await sendAuthRequest(`${apiBase()}/features/default`);
     if (!request.ok) {
       throw new Error(request.statusText);