diff --git a/apps/desktop/src/renderer/src/modules/app/EnvironmentIndicator.tsx b/apps/desktop/src/renderer/src/modules/app/EnvironmentIndicator.tsx index abd2d246d..f0596b636 100644 --- a/apps/desktop/src/renderer/src/modules/app/EnvironmentIndicator.tsx +++ b/apps/desktop/src/renderer/src/modules/app/EnvironmentIndicator.tsx @@ -5,7 +5,7 @@ import { TooltipPortal, TooltipTrigger, } from "@follow/components/ui/tooltip/index.jsx" -import { DEV } from "@follow/shared/constants" +import { DEV, MODE } from "@follow/shared/constants" import { env } from "@follow/shared/env.desktop" import { useUserRole } from "~/atoms/user" @@ -52,7 +52,7 @@ export const EnvironmentIndicator = () => { >
{role}:{DEV && } - {import.meta.env.MODE} + {MODE}
diff --git a/apps/desktop/src/renderer/src/modules/settings/tabs/about.tsx b/apps/desktop/src/renderer/src/modules/settings/tabs/about.tsx index 1162159a4..2bb963017 100644 --- a/apps/desktop/src/renderer/src/modules/settings/tabs/about.tsx +++ b/apps/desktop/src/renderer/src/modules/settings/tabs/about.tsx @@ -2,7 +2,7 @@ import { Logo } from "@follow/components/icons/logo.jsx" import { Button } from "@follow/components/ui/button/index.js" import { styledButtonVariant } from "@follow/components/ui/button/variants.js" import { Divider } from "@follow/components/ui/divider/index.js" -import { PROD } from "@follow/shared/constants" +import { MODE, ModeEnum } from "@follow/shared/constants" import { getCurrentEnvironment } from "@follow/utils/environment" import PKG, { repository } from "@pkg" import { useQuery } from "@tanstack/react-query" @@ -31,7 +31,7 @@ export const SettingAbout = () => {
- {APP_NAME} {!PROD ? `(${import.meta.env.MODE})` : ""} + {APP_NAME} {MODE !== ModeEnum.production ? `(${MODE})` : ""}
{appVersion && ( diff --git a/apps/mobile/app.config.ts b/apps/mobile/app.config.ts index 5affcab8e..6429430dd 100644 --- a/apps/mobile/app.config.ts +++ b/apps/mobile/app.config.ts @@ -6,8 +6,16 @@ import PKG from "./package.json" const isCI = process.env.CI === "true" // const roundedIconPath = resolve(__dirname, "../../resources/icon.png") -const iconPath = resolve(__dirname, "./assets/icon.png") +const iconPathMap = { + production: resolve(__dirname, "./assets/icon.png"), + development: resolve(__dirname, "./assets/icon-dev.png"), + "ios-simulator": resolve(__dirname, "./assets/icon-dev.png"), + preview: resolve(__dirname, "./assets/icon-staging.png"), +} as Record +const iconPath = iconPathMap[process.env.PROFILE || "production"] || iconPathMap.production + const adaptiveIconPath = resolve(__dirname, "./assets/adaptive-icon.png") + export default ({ config }: ConfigContext): ExpoConfig => ({ ...config, diff --git a/apps/mobile/assets/icon-dev.png b/apps/mobile/assets/icon-dev.png new file mode 100644 index 000000000..bd7eb1a53 Binary files /dev/null and b/apps/mobile/assets/icon-dev.png differ diff --git a/apps/mobile/assets/icon-staging.png b/apps/mobile/assets/icon-staging.png new file mode 100644 index 000000000..63c0f907a Binary files /dev/null and b/apps/mobile/assets/icon-staging.png differ diff --git a/apps/mobile/eas.json b/apps/mobile/eas.json index e8c595c57..8c4881cbf 100644 --- a/apps/mobile/eas.json +++ b/apps/mobile/eas.json @@ -7,21 +7,33 @@ "development": { "developmentClient": true, "distribution": "internal", - "channel": "development" + "channel": "development", + "env": { + "PROFILE": "development" + } }, "ios-simulator": { "extends": "development", "ios": { "simulator": true + }, + "env": { + "PROFILE": "ios-simulator" } }, "preview": { "distribution": "internal", - "channel": "preview" + "channel": "preview", + "env": { + "PROFILE": "preview" + } }, "production": { "autoIncrement": true, - "channel": "production" + "channel": "production", + "env": { + "PROFILE": "production" + } } }, "submit": { diff --git a/packages/utils/src/environment.ts b/packages/utils/src/environment.ts index 415035bac..bfbc015c9 100644 --- a/packages/utils/src/environment.ts +++ b/packages/utils/src/environment.ts @@ -1,4 +1,4 @@ -import { IN_ELECTRON } from "@follow/shared/constants" +import { IN_ELECTRON, MODE } from "@follow/shared/constants" import { nanoid } from "nanoid" import { detectBrowser, getOS } from "./utils" @@ -22,5 +22,6 @@ export const getCurrentEnvironment = () => { `**Env**: ${env}`, `**Browser**: ${browser}`, `**Session Trace Id**: \`${appSessionTraceId}\``, + `**Mode**: ${MODE}`, ] }