Move GoalProps to types/goals (#648)

sillsdev · Aug 27, 2020 · 8c14b92 · 8c14b92
1 parent 0df01a3
commit 8c14b92
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git 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
@@ -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;
 }