Fixes all ts errors, hopefully :P

rgommezz · Jan 21, 2020 · 87c88b0 · 87c88b0
1 parent 4b2f897
commit 87c88b0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/src/components/NetworkProvider.tsx b/src/components/NetworkProvider.tsx
@@ -16,11 +16,20 @@ function NetworkProvider({
   pingServerUrl = DEFAULT_ARGS.pingServerUrl,
   pingTimeout = DEFAULT_ARGS.pingTimeout,
   shouldPing = DEFAULT_ARGS.shouldPing,
-  ...rest
-}: Props) {
-  const { children } = rest;
+  children,
+}: Partial<Props>) {
   return (
-    <NetworkConnectivity {...rest}>
+    <NetworkConnectivity
+      {...{
+        httpMethod,
+        pingInBackground,
+        pingInterval,
+        pingOnlyIfOffline,
+        pingServerUrl,
+        pingTimeout,
+        shouldPing,
+      }}
+    >
       {connectionState => (
         <NetworkContext.Provider value={connectionState}>
           {children}

diff --git a/src/components/ReduxNetworkProvider.tsx b/src/components/ReduxNetworkProvider.tsx
@@ -42,8 +42,8 @@ class ReduxNetworkProvider extends React.Component<Props> {
   }
 }
 
-const mapStateToProps = (state: AppState, _?: OwnProps) => ({
-  isConnected: !!state.network.isConnected,
+const mapStateToProps = (state: AppState) => ({
+  isConnected: state.network.isConnected,
 });
 
 const ConnectedReduxNetworkProvider = connect(mapStateToProps)(

diff --git a/test/ReduxNetworkProvider.test.tsx b/test/ReduxNetworkProvider.test.tsx
@@ -10,6 +10,7 @@ import {
   mapStateToProps,
 } from '../src/components/ReduxNetworkProvider';
 import { connectionChange } from '../src/redux/actionCreators';
+import { NetworkState } from '../src/types';
 
 const dispatch = jest.fn();
 const props = {
@@ -69,8 +70,10 @@ describe('ReduxNetworkProvider', () => {
 
 describe('mapStateToProps', () => {
   it('maps isConnected and actionQueue state to props', () => {
-    const networkState = {
+    const networkState: NetworkState = {
       isConnected: false,
+      actionQueue: [],
+      isQueuePaused: false,
     };
     const state = {
       network: networkState,