From 8c14b92453a211a0d245738156dac3ab8f3cd155 Mon Sep 17 00:00:00 2001
From: "D. Ror" <imnasnainaec@gmail.com>
Date: Thu, 27 Aug 2020 10:43:25 -0400
Subject: [PATCH] Move GoalProps to types/goals (#648)

---
 src/goals/MergeDupGoal/MergeDups.tsx | 9 ++-------
 src/types/goals.tsx                  | 7 ++++---
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/goals/MergeDupGoal/MergeDups.tsx b/src/goals/MergeDupGoal/MergeDups.tsx
index 661b234147..4e0245a19a 100644
--- a/src/goals/MergeDupGoal/MergeDups.tsx
+++ b/src/goals/MergeDupGoal/MergeDups.tsx
@@ -1,22 +1,17 @@
 import {
   Goal,
-  Tools,
   GoalOption,
   GoalType,
   generateGuid,
+  Tools,
 } from "../../types/goals";
 import { User } from "../../types/user";
 import { Word } from "../../types/word";
 
-//interface for component state
-export interface MergeDupProps {
-  goal?: Goal;
-}
-
+//interfaces for component state
 export interface MergeDupData {
   plannedWords: Word[][];
 }
-
 export interface MergeStepData {
   words: Word[];
 }
diff --git a/src/types/goals.tsx b/src/types/goals.tsx
index 20b355b915..1889e3c046 100644
--- a/src/types/goals.tsx
+++ b/src/types/goals.tsx
@@ -1,6 +1,5 @@
 import { User } from "./user";
 import { MergeStepData, MergeDupData } from "../goals/MergeDupGoal/MergeDups";
-import { MergeDupProps } from "../goals/MergeDupGoal/MergeDups";
 import {
   CreateCharInvData,
   CreateCharInvStepData,
@@ -19,14 +18,16 @@ export enum Tools {
   CharCreate,
 }
 
-export type GoalProps = MergeDupProps;
-
 export type GoalData = MergeDupData | CreateCharInvData | {}; // | OtherTypes
 
 export type MockGoalStepType = {};
 
 export type GoalStep = MergeStepData | CreateCharInvStepData; // | OtherTypes
 
+export interface GoalProps {
+  goal?: Goal;
+}
+
 export interface GoalViewState {
   state: GoalsState;
 }