Migrate to new redux annotations

3 files changed, 12 insertions, 12 deletions

diff --git a/app/redux/connection/actions.js b/app/redux/connection/actions.js
index aae63b5506..9f573bede2 100644
--- a/app/redux/connection/actions.js
+++ b/app/redux/connection/actions.js
@@ -4,13 +4,13 @@ import { clipboard } from 'electron';
 
 import type { Backend } from '../../lib/backend';
 import type { ConnectionReduxState } from './reducers.js';
-import type { ReduxGetStateFn, ReduxDispatchFn } from '../store';
+import type { ReduxGetState, ReduxDispatch } from '../store';
 
 
 const connect = (backend: Backend, addr: string) => () => backend.connect(addr);
 const disconnect = (backend: Backend) => () => backend.disconnect();
 const copyIPAddress = () => {
-  return (_dispatch: ReduxDispatchFn, getState: ReduxGetStateFn) => {
+  return (_dispatch: ReduxDispatch, getState: ReduxGetState) => {
     const ip: ?string = getState().connection.clientIp;
     if(ip) {
       clipboard.writeText(ip);
diff --git a/app/redux/store.js b/app/redux/store.js
index 76447efc17..93b748ed7a 100644
--- a/app/redux/store.js
+++ b/app/redux/store.js
@@ -10,7 +10,7 @@ import connectionActions from './connection/actions.js';
 import settings from './settings/reducers.js';
 import settingsActions from './settings/actions.js';
 
-import type { Store, Dispatch } from 'redux';
+import type { Store } from 'redux';
 import type { History } from 'history';
 import type { AccountReduxState } from './account/reducers.js';
 import type { ConnectionReduxState } from './connection/reducers.js';
@@ -25,14 +25,14 @@ export type ReduxState = {
   connection: ConnectionReduxState,
   settings: SettingsReduxState
 };
-export type ReduxAction = Function
-                              | LoginChangeAction
-                              | UpdateSettingsAction
-                              | ConnectionChangeAction;
 
-export type ReduxStore = Store<ReduxState, ReduxAction>;
-export type ReduxGetStateFn = () => ReduxState;
-export type ReduxDispatchFn = Dispatch<ReduxAction>;
+export type ReduxAction = LoginChangeAction
+                          | UpdateSettingsAction
+                          | ConnectionChangeAction;
+export type ReduxStore = Store<ReduxState, ReduxAction, ReduxDispatch>;
+export type ReduxGetState = () => ReduxState;
+export type ReduxDispatch = (action: ReduxAction | ReduxThunk) => any;
+export type ReduxThunk = (dispatch: ReduxDispatch, getState: ReduxGetState) => any;
 
 export default function configureStore(initialState: ?ReduxState, routerHistory: History): ReduxStore {
   const router = routerMiddleware(routerHistory);
diff --git a/app/routes.js b/app/routes.js
index 60fb412003..0770785ba4 100644
--- a/app/routes.js
+++ b/app/routes.js
@@ -11,7 +11,7 @@ import AccountPage from './containers/AccountPage';
 import SelectLocationPage from './containers/SelectLocationPage';
 import { getTransitionProps } from './transitions';
 
-import type { ReduxGetStateFn } from './redux/store';
+import type { ReduxGetState } from './redux/store';
 import type { Backend } from './lib/backend';
 
 export type SharedRouteProps = {
@@ -22,7 +22,7 @@ type CustomRouteProps = {
   component: ReactClass<*>
 };
 
-export default function makeRoutes(getState: ReduxGetStateFn, componentProps: SharedRouteProps): React.Element<*> {
+export default function makeRoutes(getState: ReduxGetState, componentProps: SharedRouteProps): React.Element<*> {
 
   // Merge props and render component
   const renderMergedProps = (ComponentClass: ReactClass<*>, ...rest: Array<Object>): React.Element<*> => {