diff --git a/packages/app/src/runtime/i18n/en.ts b/packages/app/src/runtime/i18n/en.ts index a3841e19f92..2296d5cd906 100644 --- a/packages/app/src/runtime/i18n/en.ts +++ b/packages/app/src/runtime/i18n/en.ts @@ -517,8 +517,6 @@ export const dict = { "error.page.details.label": "Error Details", "error.page.action.restart": "Restart", "error.page.action.reload": "Reload", - "error.page.action.restartService": "Restart Service", - "error.page.action.restartingService": "Restarting Service…", "error.page.action.report": "Report Error", "error.page.action.reported": "Error Reported", "error.page.action.exportLogs": "Export Logs", diff --git a/packages/app/src/shell/errors/error.stories.tsx b/packages/app/src/shell/errors/error.stories.tsx index 559a2ae7d1e..a5ab69dfda3 100644 --- a/packages/app/src/shell/errors/error.stories.tsx +++ b/packages/app/src/shell/errors/error.stories.tsx @@ -50,10 +50,6 @@ export const LocalServerStartup = { render: () => page(desktop, startupFailure()), } -export const LocalServerStartupWithoutRestartService = { - render: () => page({ ...desktop, restartService: undefined }, startupFailure()), -} - export const UnexpectedError = { render: () => page( diff --git a/packages/app/src/shell/errors/error.tsx b/packages/app/src/shell/errors/error.tsx index 31a29da411a..59977849729 100644 --- a/packages/app/src/shell/errors/error.tsx +++ b/packages/app/src/shell/errors/error.tsx @@ -262,11 +262,11 @@ export const ErrorPage: Component = (props) => { const [store, setStore] = createStore<{ actionError: string | undefined captureException: typeof captureException | undefined - restartingService: boolean + restarting: boolean }>({ actionError: undefined, captureException: undefined, - restartingService: false, + restarting: false, }) function ensureFatalErrorRecorded() { @@ -317,16 +317,15 @@ export const ErrorPage: Component = (props) => { return state?.status === "ready" || state?.status === "download-required" ? state.version : undefined } - // A service that failed to boot stays registered, so relaunching alone would reattach to it. - const restartService = () => - errorDescriptionKey(props.error) === "error.page.description.localServerStartup" - ? platform.restartService - : undefined - - async function runRestartService(restart: () => Promise) { - setStore({ restartingService: true, actionError: undefined }) - await restart().catch((err) => { - setStore({ restartingService: false, actionError: formatError(err, language.t) }) + async function restart() { + setStore({ restarting: true, actionError: undefined }) + // A service that failed to boot stays registered, so relaunching alone would reattach to it. + const service = + errorDescriptionKey(props.error) === "error.page.description.localServerStartup" + ? platform.restartService + : undefined + await (service ? service() : platform.restart()).catch((err) => { + setStore({ restarting: false, actionError: formatError(err, language.t) }) }) } @@ -368,22 +367,8 @@ export const ErrorPage: Component = (props) => { label={language.t("error.page.details.label")} hideLabel /> -
- - {(restart) => ( - - )} - -