diff --git a/web/apps/photos/src/components/Sidebar/MapSettings.tsx b/web/apps/photos/src/components/Sidebar/MapSettings.tsx index f858525700..1c1c99d5d0 100644 --- a/web/apps/photos/src/components/Sidebar/MapSettings.tsx +++ b/web/apps/photos/src/components/Sidebar/MapSettings.tsx @@ -1,3 +1,4 @@ +import { InlineErrorIndicator } from "@/base/components/ErrorIndicator"; import { MenuItemGroup } from "@/base/components/Menu"; import { FocusVisibleButton } from "@/base/components/mui/FocusVisibleButton"; import { LoadingButton } from "@/base/components/mui/LoadingButton"; @@ -176,11 +177,7 @@ const ConfirmEnableMap: React.FC = ({ - {phase == "failed" && ( - - {t("generic_error")} - - )} + {phase == "failed" && } = ({ - {phase == "failed" && ( - - {t("generic_error")} - - )} + {phase == "failed" && } = ({ export const InlineErrorIndicator: React.FC = ({ children, }) => ( - - + + {children ?? t("generic_error")} diff --git a/web/packages/base/components/MiniDialog.tsx b/web/packages/base/components/MiniDialog.tsx index a0ba423e47..e8986cae09 100644 --- a/web/packages/base/components/MiniDialog.tsx +++ b/web/packages/base/components/MiniDialog.tsx @@ -13,6 +13,7 @@ import { import { t } from "i18next"; import React, { useState } from "react"; import log from "../log"; +import { InlineErrorIndicator } from "./ErrorIndicator"; /** * Customize the contents of an {@link AttributedMiniDialog}. @@ -161,12 +162,6 @@ export const AttributedMiniDialog: React.FC< const { PaperProps, ...rest } = props; - const errorIndicator = phase == "failed" && ( - - {t("generic_error")} - - ); - const loadingButton = attributes.continue && ( - {errorIndicator} + {phase == "failed" && } {attributes.buttonDirection == "row" ? ( <> {cancelButton}