From e97c2d5325a5e45be6bb669cb1958eebbe5f3a86 Mon Sep 17 00:00:00 2001 From: lbratkovskaya Date: Tue, 9 Mar 2021 21:46:20 +0500 Subject: [PATCH] fix: fix redux router types --- src/store/rootConnector.ts | 2 +- src/store/types.ts | 4 ++-- src/types/index.d.ts | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/store/rootConnector.ts b/src/store/rootConnector.ts index e23e98f..ef68228 100644 --- a/src/store/rootConnector.ts +++ b/src/store/rootConnector.ts @@ -1,6 +1,6 @@ import { connect, ConnectedProps } from 'react-redux'; import { Dispatch } from 'redux'; -import { IAppState } from './rootReducer'; +import { IAppState } from './types'; export type rootProps = ConnectedProps; diff --git a/src/store/types.ts b/src/store/types.ts index 0133296..15be055 100644 --- a/src/store/types.ts +++ b/src/store/types.ts @@ -1,14 +1,14 @@ import { Country } from '../types'; export interface IAppState { - lang: 'EN' | 'RU' | 'DE', + lang: 'EN' | 'RU' | 'DE' | undefined, countries: Country[], } export interface RootReducerAction { type: string, payload: { - lang?: string, + lang?: 'EN' | 'RU' | 'DE', countries?: Country[], } } diff --git a/src/types/index.d.ts b/src/types/index.d.ts index 40f1ea2..6430bc3 100644 --- a/src/types/index.d.ts +++ b/src/types/index.d.ts @@ -2,7 +2,9 @@ export interface Country { id: string, name: string, pictureURL: string, + capitalLatLng?: [number, number] | undefined, } + export interface URLParamTypes { countryId: string, }