diff --git a/src/routes/pages/settings/UpdateAppPage.tsx b/src/routes/pages/settings/UpdateAppPage.tsx index d0182c2125..6ca2b389a0 100644 --- a/src/routes/pages/settings/UpdateAppPage.tsx +++ b/src/routes/pages/settings/UpdateAppPage.tsx @@ -23,6 +23,7 @@ import { PageContentIonSpinner } from "#/features/user/AsyncProfile"; import { ua } from "#/helpers/device"; import { unloadServiceWorkerAndRefresh } from "#/helpers/serviceWorker"; +import AppVersionInfo from "./about/AppVersionInfo"; import { UpdateContext } from "./update/UpdateContext"; const UpToDateText = styled.div` @@ -108,7 +109,7 @@ export default function UpdateAppPage() { Current version - {import.meta.env.APP_VERSION} + { - if (import.meta.env.DEV) return Development; - - // If the app version is different from the git ref (tag), it's a pre-release - if (import.meta.env.APP_GIT_REF !== import.meta.env.APP_VERSION) - return ( - - Beta Track — [{import.meta.env.APP_BUILD}]{" "} - {import.meta.env.APP_GIT_REF.slice(0, 7)} - - ); -})(); - export default function AppDetails() { return (
- Voyager {import.meta.env.APP_VERSION} - {buildInfo && } + Voyager
diff --git a/src/routes/pages/settings/about/AppVersionInfo.tsx b/src/routes/pages/settings/about/AppVersionInfo.tsx new file mode 100644 index 0000000000..808590b7c0 --- /dev/null +++ b/src/routes/pages/settings/about/AppVersionInfo.tsx @@ -0,0 +1,34 @@ +import { IonText } from "@ionic/react"; +import React from "react"; + +interface AppVersionInfoProps { + betaAs?: React.ElementType; + betaPrefix?: string; +} + +export default function AppVersionInfo({ + betaAs: BetaEl = React.Fragment, + ...props +}: AppVersionInfoProps) { + return ( + <> + {import.meta.env.APP_VERSION}{" "} + + + + + ); +} + +function BetaInfo({ betaPrefix }: AppVersionInfoProps) { + if (import.meta.env.DEV) return Development; + + // If the app version is different from the git ref (tag), it's a pre-release + if (import.meta.env.APP_GIT_REF !== import.meta.env.APP_VERSION) + return ( + + {betaPrefix && `${betaPrefix} – `}[{import.meta.env.APP_BUILD}]{" "} + {import.meta.env.APP_GIT_REF.slice(0, 7)} + + ); +}