6 files changed, 93 insertions, 116 deletions

diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index f7c016c2b..447542f56 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -68,9 +68,9 @@ const paths = {
     watch: 'src/styles/**/*.scss',
   },
   javascripts: {
-    src: 'src/**/*.js',
+    src: ['src/**/*.js', 'src/**/*.jsx'],
     dest: 'build/',
-    watch: 'src/**/*.js',
+    watch: ['src/**/*.js', 'src/**/*.jsx'],
   },
   typescripts: {
     src: ['src/**/*.ts', 'src/**/*.tsx'],
@@ -187,7 +187,7 @@ export function styles() {
 
 export function processJavascripts() {
   return gulp
-    .src([paths.javascripts.src], { since: gulp.lastRun(processJavascripts) })
+    .src(paths.javascripts.src, { since: gulp.lastRun(processJavascripts) })
     .pipe(
       babel({
         comments: false,
diff --git a/src/app.js b/src/app.jsx
index c92d044e6..db0dee392 100644
--- a/src/app.js
+++ b/src/app.jsx
@@ -38,7 +38,7 @@ window.addEventListener('load', () => {
     render() {
       const preparedApp = (
         <Provider stores={stores} actions={actions}>
-          <I18N>
+          <I18N stores={{ app: stores.app, user: stores.user }}>
             <Routes history={history} />
           </I18N>
         </Provider>
diff --git a/src/stores.types.ts b/src/stores.types.ts
index b0912c463..462d862d9 100644
--- a/src/stores.types.ts
+++ b/src/stores.types.ts
@@ -3,6 +3,7 @@ import Recipe from './models/Recipe';
 import Service from './models/Service';
 import User from './models/User';
 import { CachedRequest } from './stores/lib/CachedRequest';
+import Reaction from './stores/lib/Reaction';
 
 export interface FerdiumStores {
   app: AppStore;
@@ -61,11 +62,21 @@ interface Api {
   user: UserStore;
 }
 
-interface AppStore {
+interface TypedStore {
   actions: Actions;
+  api: Api;
+  stores: Stores;
+  _reactions: Reaction[];
+  _status: any;
+  actionStatus: () => void;
+  initialize: () => void;
+  tearDown: () => void;
+  resetStatus: () => void;
+}
+
+interface AppStore extends TypedStore {
   accentColor: string;
   progressbarAccentColor: string;
-  api: Api;
   authRequestFailed: () => void;
   autoLaunchOnStart: () => void;
   automaticUpdates: boolean;
@@ -84,7 +95,6 @@ interface AppStore {
   locale: () => void;
   reloadAfterResume: boolean;
   reloadAfterResumeTime: number;
-  stores: Stores;
   timeOfflineStart: () => void;
   timeSuspensionStart: () => void;
   updateStatus: () => void;
@@ -95,91 +105,56 @@ interface AppStore {
     DOWNLOADED: 'DOWNLOADED';
     FAILED: 'FAILED';
   };
-  _reactions: any[];
-  _status: () => void;
-  actionStatus: () => void;
   cacheSize: () => void;
   debugInfo: () => void;
 }
 
-interface CommunityRecipesStore {
-  actions: Actions;
-  stores: Stores;
-  _actions: any[];
-  _reactions: any[];
+interface CommunityRecipesStore extends TypedStore {
   communityRecipes: () => void;
 }
 
-interface FeaturesStore {
-  actions: Actions;
-  api: Api;
+interface FeaturesStore extends TypedStore {
+  anonymousFeatures: () => void;
   defaultFeaturesRequest: () => void;
   features: () => void;
   featuresRequest: CachedRequest;
-  stores: Stores;
-  _reactions: any[];
-  _status: () => void;
+  _monitorLoginStatus: () => void;
   _updateFeatures: () => void;
-  actionStatus: () => void;
-  anonymousFeatures: () => void;
+  _setupFeatures: () => void;
 }
 
-interface GlobalErrorStore {
-  actions: Actions;
-  api: Api;
+interface GlobalErrorStore extends TypedStore {
   error: () => void;
   messages: () => void;
   response: () => void;
-  stores: Stores;
   _handleRequests: () => void;
-  _reactions: [];
-  _status: () => void;
-  actionStatus: () => void;
 }
 
-interface RecipePreviewsStore {
-  actions: Actions;
+interface RecipePreviewsStore extends TypedStore {
   allRecipePreviewsRequest: () => void;
-  api: Api;
   searchRecipePreviewsRequest: () => void;
-  stores: Stores;
-  _reactions: [];
-  _status: () => void;
-  actionStatus: () => void;
   all: Recipe[];
   dev: Recipe[];
   searchResults: () => void;
 }
 
-interface RecipeStore {
-  actions: Actions;
+interface RecipeStore extends TypedStore {
   allRecipesRequest: () => void;
-  api: Api;
   getRecipeUpdatesRequest: () => void;
   installRecipeRequest: () => void;
-  stores: Stores;
-  _reactions: any[];
-  _status: () => void;
-  actionStatus: () => void;
   isInstalled: (id: string) => boolean;
   active: () => void;
   all: Recipe[];
   recipeIdForServices: () => void;
 }
 
-interface RequestsStore {
-  actions: Actions;
-  api: Api;
+interface RequestsStore extends TypedStore {
   localServerPort: () => void;
   retries: number;
   retryDelay: number;
   servicesRequest: () => void;
   showRequiredRequestsError: () => void;
-  stores: Stores;
   userInfoRequest: () => void;
-  _reactions: any[];
-  _status: () => void;
-  actionStatus: () => void;
   areRequiredRequestsLoading: () => void;
   areRequiredRequestsSuccessful: () => void;
 }
@@ -203,9 +178,7 @@ interface RouterStore {
   replace: () => void;
 }
 
-export interface ServicesStore {
-  actions: Actions;
-  api: Api;
+export interface ServicesStore extends TypedStore {
   clearCacheRequest: () => void;
   createServiceRequest: () => void;
   deleteServiceRequest: () => void;
@@ -214,11 +187,7 @@ export interface ServicesStore {
   lastUsedServices: () => void;
   reorderServicesRequest: () => void;
   serviceMaintenanceTick: () => void;
-  stores: Stores;
   updateServiceRequest: () => void;
-  _reactions: any[];
-  _status: () => void;
-  actionStatus: () => void;
   active: () => void;
   activeSettings: () => void;
   all: Service[];
@@ -235,17 +204,11 @@ interface ISettings {
   [key: string]: any;
 }
 
-interface SettingsStore {
-  actions: Actions;
-  api: Api;
+interface SettingsStore extends TypedStore {
   fileSystemSettingsTypes: any[];
   loaded: boolean;
-  stores: Stores;
   updateAppSettingsRequest: () => void;
   _fileSystemSettingsCache: () => void;
-  _reactions: [];
-  _status: () => void;
-  actionStatus: () => void;
   all: ISettings;
   app: AppStore;
   migration: () => void;
@@ -254,22 +217,17 @@ interface SettingsStore {
   stats: () => void;
 }
 
-interface TodosStore {
-  actions: Actions;
-  api: Api;
+interface TodosStore extends TypedStore {
   isFeatureActive: () => void;
   isInitialized: true;
-  stores: Stores;
   userAgentModel: () => void;
   webview: () => void;
-  _actions: any[];
   _allReactions: any[];
   _firstLaunchReaction: () => void;
   _goToService: () => void;
   _handleNewWindowEvent: () => void;
   _onTodosClientInitialized: () => void;
   _openDevTools: () => void;
-  _reactions: any[];
   _reload: () => void;
   _routeCheckReaction: () => void;
   _updateSettings: () => void;
@@ -292,14 +250,8 @@ interface TodosStore {
   _toggleTodosPanel: () => void;
 }
 
-interface UIStore {
-  actions: Actions;
-  api: Api;
+interface UIStore extends TypedStore {
   isOsDarkThemeActive: () => void;
-  stores: Stores;
-  _reactions: [];
-  _status: () => void;
-  actionStatus: () => void;
   showServicesUpdatedInfoBar: boolean;
   isDarkThemeActive: () => void;
   isSplitModeActive: () => void;
@@ -308,7 +260,7 @@ interface UIStore {
   theme: () => void;
 }
 
-interface UserStore {
+interface UserStore extends TypedStore {
   BASE_ROUTE: '/auth';
   CHANGE_SERVER_ROUTE: '/auth/server';
   IMPORT_ROUTE: '/auth/signup/import';
@@ -320,9 +272,6 @@ interface UserStore {
   SIGNUP_ROUTE: '/auth/signup';
   WELCOME_ROUTE: '/auth/welcome';
   accountType: () => void;
-  actionStatus: () => void;
-  actions: Actions;
-  api: Api;
   authToken: () => void;
   deleteAccountRequest: () => void;
   fetchUserInfoInterval: null;
@@ -339,12 +288,9 @@ interface UserStore {
   logoutReasonTypes: { SERVER: 'SERVER' };
   passwordRequest: () => void;
   signupRequest: () => void;
-  stores: Stores;
   updateUserInfoRequest: () => void;
   userData: () => void;
-  _reactions: any[];
   _requireAuthenticatedUser: () => void;
-  _status: () => void;
   changeServerRoute: () => void;
   data: User;
   importRoute: () => void;
@@ -360,7 +306,7 @@ interface UserStore {
   team: () => void;
 }
 
-export interface WorkspacesStore {
+export interface WorkspacesStore extends TypedStore {
   activeWorkspace: () => void;
   delete: ({ workspace }) => void;
   update: ({ workspace }) => void;
@@ -373,17 +319,14 @@ export interface WorkspacesStore {
   isSwitchingWorkspace: () => void;
   isWorkspaceDrawerOpen: () => void;
   nextWorkspace: () => void;
-  stores: Stores;
   workspaces: Workspace[];
   workspaceBeingEdited: () => void;
-  _actions: any[];
   _activateLastUsedWorkspaceReaction: () => void;
   _allActions: any[];
   _allReactions: any[];
   _cleanupInvalidServiceReferences: () => void;
   _getWorkspaceById: () => void;
   _openDrawerWithSettingsReaction: () => void;
-  _reactions: any[];
   _setActiveServiceOnWorkspaceSwitchReaction: () => void;
   _setWorkspaceBeingEditedReaction: () => void;
   _toggleKeepAllWorkspacesLoadedSetting: () => void;
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.ts
index e2c0c08ef..b63c252df 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.ts
@@ -1,8 +1,6 @@
 import { computed, observable, runInAction } from 'mobx';
 
-import Store from './lib/Store';
 import CachedRequest from './lib/CachedRequest';
-
 import serviceProxy from '../features/serviceProxy';
 import basicAuth from '../features/basicAuth';
 import workspaces from '../features/workspaces';
@@ -11,8 +9,9 @@ import publishDebugInfo from '../features/publishDebugInfo';
 import communityRecipes from '../features/communityRecipes';
 import todos from '../features/todos';
 import appearance from '../features/appearance';
+import TypedStore from './lib/TypedStore';
 
-export default class FeaturesStore extends Store {
+export default class FeaturesStore extends TypedStore {
   @observable defaultFeaturesRequest = new CachedRequest(
     this.api.features,
     'default',
@@ -25,7 +24,7 @@ export default class FeaturesStore extends Store {
 
   @observable features = {};
 
-  async setup() {
+  async setup(): Promise<void> {
     this.registerReactions([
       this._updateFeatures,
       this._monitorLoginStatus.bind(this),
@@ -35,11 +34,11 @@ export default class FeaturesStore extends Store {
     setTimeout(this._setupFeatures.bind(this), 1);
   }
 
-  @computed get anonymousFeatures() {
+  @computed get anonymousFeatures(): any {
     return this.defaultFeaturesRequest.execute().result || {};
   }
 
-  _updateFeatures = () => {
+  _updateFeatures = (): void => {
     const features = {};
     if (this.stores.user.isLoggedIn) {
       let requestResult = {};
@@ -55,7 +54,7 @@ export default class FeaturesStore extends Store {
     });
   };
 
-  _monitorLoginStatus() {
+  _monitorLoginStatus(): void {
     if (this.stores.user.isLoggedIn) {
       this.featuresRequest.invalidate({ immediately: true });
     } else {
@@ -64,7 +63,7 @@ export default class FeaturesStore extends Store {
     }
   }
 
-  _setupFeatures() {
+  _setupFeatures(): void {
     serviceProxy(this.stores);
     basicAuth();
     workspaces(this.stores, this.actions);
diff --git a/src/stores/GlobalErrorStore.js b/src/stores/GlobalErrorStore.ts
index 356a6f298..cb364574b 100644
--- a/src/stores/GlobalErrorStore.js
+++ b/src/stores/GlobalErrorStore.ts
@@ -1,35 +1,61 @@
 import { observable, action } from 'mobx';
-import Store from './lib/Store';
+import { Actions } from 'src/actions/lib/actions';
+import { ApiInterface } from 'src/api';
+import { Stores } from 'src/stores.types';
 import Request from './lib/Request';
+import TypedStore from './lib/TypedStore';
 
-export default class GlobalErrorStore extends Store {
-  @observable error = null;
+interface Message {
+  type: 'error' | 'log' | 'info';
+  error?: {
+    message?: string;
+    status?: number;
+  };
+  request?: {
+    result: any;
+    wasExecuted: any;
+    method: any;
+  };
+  response?: any;
+  server?: any;
+  info?: any;
+  url?: string;
+  line?: number;
+}
+
+export default class GlobalErrorStore extends TypedStore {
+  @observable error: any | null = null;
 
-  @observable messages = [];
+  @observable messages: Message[] = [];
 
-  @observable response = {};
+  @observable response: object = {};
 
-  constructor(...args) {
-    super(...args);
+  // TODO: Get rid of the @ts-ignores in this function.
+  constructor(stores: Stores, api: ApiInterface, actions: Actions) {
+    super(stores, api, actions);
 
-    window.addEventListener('error', (...errorArgs) => {
+    window.addEventListener('error', (...errorArgs: any[]): void => {
+      // @ts-ignore ts-message: Expected 5 arguments, but got 2.
       this._handleConsoleError.call(this, ['error', ...errorArgs]);
     });
 
     const origConsoleError = console.error;
-    window.console.error = (...errorArgs) => {
+    window.console.error = (...errorArgs: any[]) => {
+      // @ts-ignore ts-message: Expected 5 arguments, but got 2.
       this._handleConsoleError.call(this, ['error', ...errorArgs]);
       origConsoleError.apply(this, errorArgs);
     };
 
     const origConsoleLog = console.log;
-    window.console.log = (...logArgs) => {
+    window.console.log = (...logArgs: any[]) => {
+      // @ts-ignore ts-message: Expected 5 arguments, but got 2.
       this._handleConsoleError.call(this, ['log', ...logArgs]);
       origConsoleLog.apply(this, logArgs);
     };
 
     const origConsoleInfo = console.info;
-    window.console.info = (...infoArgs) => {
+    window.console.info = (...infoArgs: any[]) => {
+      // @ts-ignore ts-message: Expected 5 arguments, but got 2.
       this._handleConsoleError.call(this, ['info', ...infoArgs]);
       origConsoleInfo.apply(this, infoArgs);
     };
@@ -37,7 +63,11 @@ export default class GlobalErrorStore extends Store {
     Request.registerHook(this._handleRequests);
   }
 
-  _handleConsoleError(type, error, url, line) {
+  async setup(): Promise<void> {
+    // Not implemented
+  }
+
+  _handleConsoleError(type: any, error: any, url: string, line: number) {
     if (typeof type === 'object' && type.length > 0) {
       this.messages.push({
         type: type[0],
@@ -53,7 +83,13 @@ export default class GlobalErrorStore extends Store {
     }
   }
 
-  _handleRequests = action(async request => {
+  @action _handleRequests = async (request: {
+    isError: any;
+    error: { json: () => object | PromiseLike<object> };
+    result: any;
+    wasExecuted: any;
+    _method: any;
+  }): Promise<void> => {
     if (request.isError) {
       this.error = request.error;
 
@@ -63,9 +99,8 @@ export default class GlobalErrorStore extends Store {
         } catch {
           this.response = {};
         }
-        if (this.error.status === 401) {
+        if (this.error?.status === 401) {
           window['ferdium'].stores.app.authRequestFailed = true;
-          // this.actions.user.logout({ serverLogout: true });
         }
       }
 
@@ -83,5 +118,5 @@ export default class GlobalErrorStore extends Store {
     } else {
       window['ferdium'].stores.app.authRequestFailed = false;
     }
-  });
+  };
 }
diff --git a/src/stores/lib/TypedStore.ts b/src/stores/lib/TypedStore.ts
index 5d8bf3bbd..7f9d2d60f 100644
--- a/src/stores/lib/TypedStore.ts
+++ b/src/stores/lib/TypedStore.ts
@@ -18,9 +18,9 @@ export default abstract class TypedStore {
   }
 
   constructor(
-    public stores: Stores,
-    public api: ApiInterface,
-    public actions: Actions,
+    public readonly stores: Stores,
+    public readonly api: ApiInterface,
+    public readonly actions: Actions,
   ) {}
 
   registerReactions(reactions: { (r: IReactionPublic): void }[]): void {