diff --git a/ts/RemoteConfig.ts b/ts/RemoteConfig.ts index 513b28e488..da30527406 100644 --- a/ts/RemoteConfig.ts +++ b/ts/RemoteConfig.ts @@ -32,8 +32,8 @@ export type ConfigKeyType = | 'desktop.sendSenderKey3' | 'desktop.showUserBadges.beta' | 'desktop.showUserBadges2' - | 'desktop.stories' - | 'desktop.stories.beta' + | 'desktop.stories2' + | 'desktop.stories2.beta' | 'desktop.usernames' | 'global.attachments.maxBytes' | 'global.calling.maxGroupCallRingSize' diff --git a/ts/state/selectors/items.ts b/ts/state/selectors/items.ts index c4d11a2719..c9c33a95d5 100644 --- a/ts/state/selectors/items.ts +++ b/ts/state/selectors/items.ts @@ -94,7 +94,7 @@ export const getStoriesEnabled = createSelector( } if ( - isRemoteConfigBucketEnabled(remoteConfig, 'desktop.stories', e164, aci) + isRemoteConfigBucketEnabled(remoteConfig, 'desktop.stories2', e164, aci) ) { return true; } @@ -104,7 +104,7 @@ export const getStoriesEnabled = createSelector( } if ( - isRemoteConfigFlagEnabled(remoteConfig, 'desktop.stories.beta') && + isRemoteConfigFlagEnabled(remoteConfig, 'desktop.stories2.beta') && isBeta(window.getVersion()) ) { return true; diff --git a/ts/test-both/RemoteConfig_test.ts b/ts/test-both/RemoteConfig_test.ts index df761c79a5..ad624ca4d6 100644 --- a/ts/test-both/RemoteConfig_test.ts +++ b/ts/test-both/RemoteConfig_test.ts @@ -13,12 +13,12 @@ describe('RemoteConfig', () => { const uuid = '15b9729c-51ea-4ddb-b516-652befe78062'; describe('#innerIsBucketValueEnabled', () => { - // Note: bucketValue is 497941 for 'desktop.stories' key + // Note: bucketValue is 497941 for 'desktop.stories2' key it('returns true for 100% wildcard', () => { assert.strictEqual( innerIsBucketValueEnabled( - 'desktop.stories', + 'desktop.stories2', '*:1000000', '+12125550000', uuid @@ -30,7 +30,7 @@ describe('RemoteConfig', () => { it('returns true for 50% on country code 1', () => { assert.strictEqual( innerIsBucketValueEnabled( - 'desktop.stories', + 'desktop.stories2', '1:500000', '+12125550000', uuid @@ -42,7 +42,7 @@ describe('RemoteConfig', () => { it('returns false for 40% on country code 1', () => { assert.strictEqual( innerIsBucketValueEnabled( - 'desktop.stories', + 'desktop.stories2', '1:400000', '+12125550000', uuid diff --git a/ts/util/stories.ts b/ts/util/stories.ts index 9131c7dd4c..c03a61b916 100644 --- a/ts/util/stories.ts +++ b/ts/util/stories.ts @@ -9,7 +9,7 @@ import { isBeta } from './version'; export const getStoriesAvailable = (): boolean => { if ( isBucketValueEnabled( - 'desktop.stories', + 'desktop.stories2', window.textsecure.storage.user.getNumber(), window.textsecure.storage.user.getUuid(UUIDKind.ACI)?.toString() ) @@ -21,7 +21,7 @@ export const getStoriesAvailable = (): boolean => { return true; } - if (isEnabled('desktop.stories.beta') && isBeta(window.getVersion())) { + if (isEnabled('desktop.stories2.beta') && isBeta(window.getVersion())) { return true; }