From 324518feac438d746bd950d3377551b25b18622f Mon Sep 17 00:00:00 2001
From: Michael Ossig <mrossig201@gmail.com>
Date: Fri, 18 Mar 2022 12:53:13 -0400
Subject: [PATCH] updated typings, refactored exports

---
 packages/client/src/app/actions.ts                |  3 +--
 packages/client/src/app/index.ts                  |  8 ++++----
 packages/client/src/app/reducers/configuration.ts |  4 +---
 packages/client/src/app/reducers/index.ts         |  6 ++----
 packages/client/src/app/reducers/user.ts          |  4 +---
 packages/client/src/{config.js => config.ts}      |  0
 packages/client/src/hooks/index.ts                | 11 ++++++-----
 packages/client/src/hooks/types.ts                |  4 +++-
 8 files changed, 18 insertions(+), 22 deletions(-)
 rename packages/client/src/{config.js => config.ts} (100%)

diff --git a/packages/client/src/app/actions.ts b/packages/client/src/app/actions.ts
index fbd9507..fcf79c7 100644
--- a/packages/client/src/app/actions.ts
+++ b/packages/client/src/app/actions.ts
@@ -1,2 +1 @@
-export { updateUserInfo, clearUserInfo } from './reducers/user';
-export { updateConfigurationInfo, clearConfigurationInfo } from './reducers/configuration';
+export { userActions, configurationActions } from './reducers';
diff --git a/packages/client/src/app/index.ts b/packages/client/src/app/index.ts
index 7d17111..5253f17 100644
--- a/packages/client/src/app/index.ts
+++ b/packages/client/src/app/index.ts
@@ -1,5 +1,5 @@
-import * as actions from './actions';
-import * as selectors from './selectors';
-import reducers from './reducers';
+export * as actions from './actions';
+export * as selectors from './selectors';
+export { userReducer, configurationReducer } from './reducers';
 
-export { actions, selectors, reducers };
+export type { ConfigurationState, UserState } from './types';
diff --git a/packages/client/src/app/reducers/configuration.ts b/packages/client/src/app/reducers/configuration.ts
index 8493020..602b795 100644
--- a/packages/client/src/app/reducers/configuration.ts
+++ b/packages/client/src/app/reducers/configuration.ts
@@ -23,6 +23,4 @@ export const configurationSlice = createSlice({
   }
 });
 
-export const { updateConfigurationInfo, clearConfigurationInfo } = configurationSlice.actions;
-
-export default configurationSlice.reducer;
+export const { actions, reducer } = configurationSlice;
diff --git a/packages/client/src/app/reducers/index.ts b/packages/client/src/app/reducers/index.ts
index 15fceff..8d75807 100644
--- a/packages/client/src/app/reducers/index.ts
+++ b/packages/client/src/app/reducers/index.ts
@@ -1,4 +1,2 @@
-import userReducer from './user';
-import configurationReducer from './configuration';
-
-export default { userReducer, configurationReducer };
+export { reducer as userReducer, actions as userActions } from './user';
+export { reducer as configurationReducer, actions as configurationActions } from './configuration';
diff --git a/packages/client/src/app/reducers/user.ts b/packages/client/src/app/reducers/user.ts
index dbdbda6..107b99d 100644
--- a/packages/client/src/app/reducers/user.ts
+++ b/packages/client/src/app/reducers/user.ts
@@ -20,6 +20,4 @@ export const userSlice = createSlice({
   }
 });
 
-export const { updateUserInfo, clearUserInfo } = userSlice.actions;
-
-export default userSlice.reducer;
+export const { actions, reducer } = userSlice;
diff --git a/packages/client/src/config.js b/packages/client/src/config.ts
similarity index 100%
rename from packages/client/src/config.js
rename to packages/client/src/config.ts
diff --git a/packages/client/src/hooks/index.ts b/packages/client/src/hooks/index.ts
index 186bf0e..5bcf302 100644
--- a/packages/client/src/hooks/index.ts
+++ b/packages/client/src/hooks/index.ts
@@ -1,9 +1,10 @@
 import { TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux';
-import { useCheckout } from './checkout/useCheckout';
-import { useInitializeCheckout } from './checkout/useInitializeCheckout';
 import type { RootState, AppDispatch } from '../store';
 
-const useAppDispatch = () => useDispatch<AppDispatch>();
-const useAppSelector: TypedUseSelectorHook<RootState> = useSelector;
+export type { InitializationRequest, EditableCheckoutConfigFields, CheckoutConfig, PaymentAmount, PaymentMethodsResponseInterface } from './types';
 
-export { useCheckout, useInitializeCheckout, useAppDispatch, useAppSelector };
+export { useCheckout } from './checkout/useCheckout';
+export { useInitializeCheckout } from './checkout/useInitializeCheckout';
+
+export const useAppDispatch = () => useDispatch<AppDispatch>();
+export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector;
diff --git a/packages/client/src/hooks/types.ts b/packages/client/src/hooks/types.ts
index 1df3722..6c5d0ae 100644
--- a/packages/client/src/hooks/types.ts
+++ b/packages/client/src/hooks/types.ts
@@ -1,4 +1,4 @@
-import { PaymentAmount, PaymentMethodsResponseInterface } from '@adyen/adyen-web/dist/types/types';
+import type { PaymentAmount, PaymentMethodsResponseInterface } from '@adyen/adyen-web/dist/types/types';
 
 export type InitializationRequest = {
   merchantAccount: string;
@@ -39,3 +39,5 @@ export interface CheckoutConfig extends EditableCheckoutConfigFields {
   onError?: (error: any, element?: any) => void;
   onPaymentCompleted?: (result: any, element: any) => void;
 }
+
+export { PaymentAmount, PaymentMethodsResponseInterface };