diff --git a/ts/RemoteConfig.ts b/ts/RemoteConfig.ts index 2173bd1051..94f2996c10 100644 --- a/ts/RemoteConfig.ts +++ b/ts/RemoteConfig.ts @@ -21,7 +21,8 @@ const KnownConfigKeys = [ 'desktop.chatFolders.beta', 'desktop.chatFolders.prod', 'desktop.clientExpiration', - 'desktop.backup.credentialFetch', + 'desktop.backups.beta', + 'desktop.backups.prod', 'desktop.donations', 'desktop.donations.prod', 'desktop.internalUser', diff --git a/ts/test-mock/bootstrap.ts b/ts/test-mock/bootstrap.ts index 84c8b65ba8..434879f3da 100644 --- a/ts/test-mock/bootstrap.ts +++ b/ts/test-mock/bootstrap.ts @@ -175,7 +175,6 @@ function sanitizePathComponent(component: string): string { } const DEFAULT_REMOTE_CONFIG = [ - ['desktop.backup.credentialFetch', { enabled: true }], ['desktop.internalUser', { enabled: true }], ['desktop.senderKey.retry', { enabled: true }], ['global.backups.mediaTierFallbackCdnNumber', { enabled: true, value: '3' }], diff --git a/ts/util/isBackupEnabled.ts b/ts/util/isBackupEnabled.ts index eca7dcb8ac..febd4bab21 100644 --- a/ts/util/isBackupEnabled.ts +++ b/ts/util/isBackupEnabled.ts @@ -4,7 +4,7 @@ import * as RemoteConfig from '../RemoteConfig'; import { isTestOrMockEnvironment } from '../environment'; import { isStagingServer } from './isStagingServer'; -import { isNightly } from './version'; +import { isBeta, isNightly } from './version'; export function areRemoteBackupsTurnedOn(): boolean { return isBackupFeatureEnabled() && window.storage.get('backupTier') != null; @@ -26,7 +26,9 @@ export function isBackupFeatureEnabled( return true; } - return Boolean( - RemoteConfig.isEnabled('desktop.backup.credentialFetch', reduxConfig) - ); + if (isBeta(window.getVersion())) { + return RemoteConfig.isEnabled('desktop.backups.beta', reduxConfig); + } + + return Boolean(RemoteConfig.isEnabled('desktop.backups.prod', reduxConfig)); }