diff --git a/app/main.ts b/app/main.ts index 4cb926020..b21b04de4 100644 --- a/app/main.ts +++ b/app/main.ts @@ -94,7 +94,7 @@ import type { MenuActionType } from '../ts/types/menu'; import { createTemplate } from './menu'; import { installFileHandler, installWebHandler } from './protocol_filter'; import * as OS from '../ts/OS'; -import { isProduction } from '../ts/util/version'; +import { isProduction, isStaging } from '../ts/util/version'; import { isSgnlHref, isCaptchaHref, @@ -1984,6 +1984,7 @@ function setupMenu(options?: Partial) { devTools: defaultWebPrefs.devTools, includeSetup: false, isProduction: isProduction(app.getVersion()), + isStaging: isStaging(app.getVersion()), platform, // actions diff --git a/app/menu.ts b/app/menu.ts index 250a26947..64c6cea93 100644 --- a/app/menu.ts +++ b/app/menu.ts @@ -22,6 +22,7 @@ export const createTemplate = ( const { isProduction, + isStaging, devTools, includeSetup, openContactUs, @@ -47,7 +48,7 @@ export const createTemplate = ( submenu: [ { label: i18n('mainMenuCreateStickers'), - click: isProduction ? showStickerCreator : openArtCreator, + click: isStaging ? openArtCreator : showStickerCreator, }, { label: i18n('mainMenuSettings'), diff --git a/config/production.json b/config/production.json index c952c1e5f..995b7af9f 100644 --- a/config/production.json +++ b/config/production.json @@ -7,6 +7,7 @@ "0": "https://cdn.signal.org", "2": "https://cdn2.signal.org" }, + "artCreatorUrl": "https://create.signal.art", "serverPublicParams": "AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXTLfN0/vLt98KDPnxwAQL9j5V1jGOY8jQl6MLxEs56cwXN0dqCnImzVH3TZT1cJ8SW1BRX6qIVxEzjsSGx3yxF3suAilPMqGRp4ffyopjMD1JXiKR2RwLKzizUe5e8XyGOy9fplzhw3jVzTRyUZTRSZKkMLWcQ/gv0E4aONNqs4P", "serverTrustRoot": "BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF", "updatesEnabled": true diff --git a/ts/background.ts b/ts/background.ts index e602a86fa..4bc5714c5 100644 --- a/ts/background.ts +++ b/ts/background.ts @@ -1082,6 +1082,7 @@ export async function startApp(): Promise { devTools: false, includeSetup: false, isProduction: true, + isStaging: false, platform: 'unknown', }; diff --git a/ts/state/ducks/user.ts b/ts/state/ducks/user.ts index 2f510a0ff..b9fd5f1ae 100644 --- a/ts/state/ducks/user.ts +++ b/ts/state/ducks/user.ts @@ -126,6 +126,7 @@ export function getEmptyState(): UserStateType { devTools: false, includeSetup: false, isProduction: true, + isStaging: false, platform: 'unknown', }, osName, diff --git a/ts/test-node/app/menu_test.ts b/ts/test-node/app/menu_test.ts index ad6c1bc31..6ad505604 100644 --- a/ts/test-node/app/menu_test.ts +++ b/ts/test-node/app/menu_test.ts @@ -238,6 +238,7 @@ describe('createTemplate', () => { devTools: true, includeSetup: false, isProduction: true, + isStaging: false, platform, ...actions, }; @@ -252,6 +253,7 @@ describe('createTemplate', () => { devTools: true, includeSetup: true, isProduction: true, + isStaging: false, platform, ...actions, }; diff --git a/ts/types/menu.ts b/ts/types/menu.ts index 81fdf19b4..df01b149e 100644 --- a/ts/types/menu.ts +++ b/ts/types/menu.ts @@ -10,6 +10,7 @@ export type MenuOptionsType = Readonly<{ devTools: boolean; includeSetup: boolean; isProduction: boolean; + isStaging: boolean; platform: string; }>;