diff --git a/src/components/DataEntry/DataEntryTable/index.tsx b/src/components/DataEntry/DataEntryTable/index.tsx index 607c3bde3f..8c44cfac8a 100644 --- a/src/components/DataEntry/DataEntryTable/index.tsx +++ b/src/components/DataEntry/DataEntryTable/index.tsx @@ -408,8 +408,8 @@ export default function DataEntryTable( selectedDup: id ? prev.suggestedDups.find((w) => w.id === id) : id === "" - ? newWord(prev.newVern) - : undefined, + ? newWord(prev.newVern) + : undefined, })); }; diff --git a/src/components/ProjectExport/DownloadButton.tsx b/src/components/ProjectExport/DownloadButton.tsx index ce844d3a90..8f08b33da5 100644 --- a/src/components/ProjectExport/DownloadButton.tsx +++ b/src/components/ProjectExport/DownloadButton.tsx @@ -108,8 +108,8 @@ export default function DownloadButton( return exportState.status === ExportStatus.Failure ? themeColors.error : props.colorSecondary - ? themeColors.secondary - : themeColors.primary; + ? themeColors.secondary + : themeColors.primary; } function iconFunction(): () => void { diff --git a/src/goals/MergeDuplicates/MergeDupsStep/MergeDragDrop/DragSense.tsx b/src/goals/MergeDuplicates/MergeDupsStep/MergeDragDrop/DragSense.tsx index 396a269a8a..ee90b14ada 100644 --- a/src/goals/MergeDuplicates/MergeDupsStep/MergeDragDrop/DragSense.tsx +++ b/src/goals/MergeDuplicates/MergeDupsStep/MergeDragDrop/DragSense.tsx @@ -116,12 +116,12 @@ export default function DragSense(props: DragSenseProps): ReactElement { background: isInSidebar ? "lightblue" : props.isProtectedSense - ? "lightyellow" - : snapshot.draggingOver === trashId - ? "red" - : snapshot.isDragging || snapshot.combineTargetFor - ? "lightgreen" - : "white", + ? "lightyellow" + : snapshot.draggingOver === trashId + ? "red" + : snapshot.isDragging || snapshot.combineTargetFor + ? "lightgreen" + : "white", }} > diff --git a/src/goals/MergeDuplicates/Redux/MergeDupsReducer.ts b/src/goals/MergeDuplicates/Redux/MergeDupsReducer.ts index 9334e402db..8f4dadc4f1 100644 --- a/src/goals/MergeDuplicates/Redux/MergeDupsReducer.ts +++ b/src/goals/MergeDuplicates/Redux/MergeDupsReducer.ts @@ -410,9 +410,8 @@ function combineIntoFirstSense(senses: MergeTreeSense[]): void { } else { const oldText = mainSense.definitions[defIndex].text; if (!oldText.split(sep).includes(def.text)) { - mainSense.definitions[ - defIndex - ].text = `${oldText}${sep}${def.text}`; + mainSense.definitions[defIndex].text = + `${oldText}${sep}${def.text}`; } } } diff --git a/src/setupTests.js b/src/setupTests.js index 6aa676a500..4558812d92 100644 --- a/src/setupTests.js +++ b/src/setupTests.js @@ -5,6 +5,3 @@ global.console.error = (message) => { global.console.warn = (message) => { throw message; }; - -// https://github.com/testing-library/react-testing-library/issues/1061#issuecomment-1117450890 -global.IS_REACT_ACT_ENVIRONMENT = true; diff --git a/src/utilities/fontContext.ts b/src/utilities/fontContext.ts index a150b74c77..ff2063eeff 100644 --- a/src/utilities/fontContext.ts +++ b/src/utilities/fontContext.ts @@ -79,17 +79,17 @@ export class ProjectFonts { direction: props.vernacular ? this.vernacularDir : props.lang - ? this.getLangDir(props.lang) - : props.analysis - ? this.analysisDir - : style?.direction, + ? this.getLangDir(props.lang) + : props.analysis + ? this.analysisDir + : style?.direction, fontFamily: props.vernacular ? this.vernacularFont : props.lang - ? this.getLangFont(props.lang) - : props.analysis - ? this.analysisFont - : style?.fontFamily ?? this.inherit, + ? this.getLangFont(props.lang) + : props.analysis + ? this.analysisFont + : style?.fontFamily ?? this.inherit, }; } } diff --git a/src/utilities/wordUtilities.ts b/src/utilities/wordUtilities.ts index 68c6fa0a33..e582b8f675 100644 --- a/src/utilities/wordUtilities.ts +++ b/src/utilities/wordUtilities.ts @@ -40,10 +40,10 @@ export function compareFlags(a: Flag, b: Flag): number { return a.active && b.active ? a.text.localeCompare(b.text) : a.active - ? -1 - : b.active - ? 1 - : 0; + ? -1 + : b.active + ? 1 + : 0; } /**