From d0f30ebf395048a1bcce3fca9cb66e97dcc4d7bd Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Wed, 22 Feb 2023 14:33:18 +1100
Subject: [PATCH] Fix scene merge dialog (#3466)

* Handle bad savedFilterIds
* Fix scene merge dialog
---
 ui/v2.5/src/components/FrontPage/FrontPageConfig.tsx | 8 ++++++--
 ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx   | 7 ++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ui/v2.5/src/components/FrontPage/FrontPageConfig.tsx b/ui/v2.5/src/components/FrontPage/FrontPageConfig.tsx
index 39668abc5..04464b655 100644
--- a/ui/v2.5/src/components/FrontPage/FrontPageConfig.tsx
+++ b/ui/v2.5/src/components/FrontPage/FrontPageConfig.tsx
@@ -243,7 +243,8 @@ const ContentRow: React.FC<IFilterRowProps> = (props: IFilterRowProps) => {
       case "SavedFilter":
         const savedFilter = props.allSavedFilters.find(
           (f) =>
-            f.id === (props.content as ISavedFilterRow).savedFilterId.toString()
+            f.id ===
+            (props.content as ISavedFilterRow).savedFilterId?.toString()
         );
         if (!savedFilter) return "";
         return filterTitle(intl, savedFilter);
@@ -337,7 +338,10 @@ export const FrontPageConfig: React.FC<IFrontPageConfigProps> = ({
   }
 
   const existingSavedFilterIDs = currentContent
-    .filter((f) => f.__typename === "SavedFilter")
+    .filter(
+      (f) =>
+        f.__typename === "SavedFilter" && (f as ISavedFilterRow).savedFilterId
+    )
     .map((f) => (f as ISavedFilterRow).savedFilterId.toString());
 
   function addSavedFilter(content?: FrontPageContent) {
diff --git a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
index 974913d93..691b03387 100644
--- a/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
@@ -1,4 +1,4 @@
-import { Form, Col, Row, Button, FormControl, Modal } from "react-bootstrap";
+import { Form, Col, Row, Button, FormControl } from "react-bootstrap";
 import React, { useCallback, useEffect, useMemo, useState } from "react";
 import * as GQL from "src/core/generated-graphql";
 import { Icon } from "../Shared/Icon";
@@ -29,6 +29,7 @@ import {
 } from "./SceneDetails/SceneScrapeDialog";
 import { galleryTitle } from "src/core/galleries";
 import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";
+import { ModalComponent } from "../Shared/Modal";
 
 interface IStashIDsField {
   values: GQL.StashId[];
@@ -655,7 +656,7 @@ export const SceneMergeModal: React.FC<ISceneMergeModalProps> = ({
   }
 
   return (
-    <Modal
+    <ModalComponent
       show={show}
       header={title}
       icon={faSignInAlt}
@@ -723,6 +724,6 @@ export const SceneMergeModal: React.FC<ISceneMergeModalProps> = ({
           </Form.Group>
         </div>
       </div>
-    </Modal>
+    </ModalComponent>
   );
 };