From f74d14a2960c7848ddd899a8ecdbd952bd3e4cb3 Mon Sep 17 00:00:00 2001 From: ayumi-signal <143036029+ayumi-signal@users.noreply.github.com> Date: Wed, 8 Oct 2025 09:29:00 -0700 Subject: [PATCH] Remove donations flags --- ts/RemoteConfig.ts | 2 -- ts/components/Preferences.stories.tsx | 10 -------- ts/components/Preferences.tsx | 37 +++++++++++---------------- ts/state/smart/Preferences.tsx | 9 ------- 4 files changed, 15 insertions(+), 43 deletions(-) diff --git a/ts/RemoteConfig.ts b/ts/RemoteConfig.ts index 7d8a870d11..b20f939fdc 100644 --- a/ts/RemoteConfig.ts +++ b/ts/RemoteConfig.ts @@ -25,8 +25,6 @@ const KnownConfigKeys = [ 'desktop.clientExpiration', 'desktop.backups.beta', 'desktop.backups.prod', - 'desktop.donations', - 'desktop.donations.prod', 'desktop.internalUser', 'desktop.loggingErrorToasts', 'desktop.mediaQuality.levels', diff --git a/ts/components/Preferences.stories.tsx b/ts/components/Preferences.stories.tsx index d396cb8396..14c01fa798 100644 --- a/ts/components/Preferences.stories.tsx +++ b/ts/components/Preferences.stories.tsx @@ -409,7 +409,6 @@ export default { customColors: {}, defaultConversationColor: DEFAULT_CONVERSATION_COLOR, deviceName: 'Work Windows ME', - donationsFeatureEnabled: false, emojiSkinToneDefault: EmojiSkinTone.None, phoneNumber: '+1 555 123-4567', hasAudioNotifications: true, @@ -683,7 +682,6 @@ DataUsage.args = { }; export const Donations = Template.bind({}); Donations.args = { - donationsFeatureEnabled: true, settingsLocation: { page: SettingsPage.Donations }, }; @@ -824,7 +822,6 @@ NotificationsPageWithThreeProfiles.args = { export const DonationsDonateFlow = Template.bind({}); DonationsDonateFlow.args = { - donationsFeatureEnabled: true, settingsLocation: { page: SettingsPage.DonationsDonateFlow }, renderDonationsPane: ({ contentsRef, @@ -852,7 +849,6 @@ DonationsDonateFlow.args = { }; export const DonationReceipts = Template.bind({}); DonationReceipts.args = { - donationsFeatureEnabled: true, settingsLocation: { page: SettingsPage.DonationsDonateFlow }, renderDonationsPane: ({ contentsRef, @@ -893,7 +889,6 @@ DonationReceipts.args = { }; export const DonationsHomeWithInProgressDonation = Template.bind({}); DonationsHomeWithInProgressDonation.args = { - donationsFeatureEnabled: true, settingsLocation: { page: SettingsPage.Donations }, renderDonationsPane: ({ contentsRef, @@ -1174,8 +1169,3 @@ NavTabsCollapsedWithExclamation.args = { readChatsMarkedUnreadCount: 0, }, }; - -export const WithDonationsEnabled = Template.bind({}); -WithDonationsEnabled.args = { - donationsFeatureEnabled: true, -}; diff --git a/ts/components/Preferences.tsx b/ts/components/Preferences.tsx index 38aaa52ad9..1d1fe69cb3 100644 --- a/ts/components/Preferences.tsx +++ b/ts/components/Preferences.tsx @@ -125,7 +125,6 @@ export type PropsDataType = { customColors: Record; defaultConversationColor: DefaultConversationColorType; deviceName?: string; - donationsFeatureEnabled: boolean; emojiSkinToneDefault: EmojiSkinTone; hasAudioNotifications?: boolean; hasAutoConvertEmoji: boolean; @@ -393,7 +392,6 @@ export function Preferences({ defaultConversationColor, deviceName = '', doDeleteAllData, - donationsFeatureEnabled, editCustomColor, emojiSkinToneDefault, exportLocalBackup, @@ -578,9 +576,6 @@ export function Preferences({ ) { setSettingsLocation({ page: SettingsPage.General }); } - if (isDonationsPage(settingsLocation.page) && !donationsFeatureEnabled) { - setSettingsLocation({ page: SettingsPage.General }); - } if (settingsLocation.page === SettingsPage.Internal && !isInternalUser) { setSettingsLocation({ page: SettingsPage.General }); } @@ -2448,23 +2443,21 @@ export function Preferences({ {i18n('icu:Preferences__button--backups')} ) : null} - {donationsFeatureEnabled && ( - - )} + {isInternalUser ? (