Skip to content

Commit 80b1eb0

Browse files
authored
Merge pull request #92140 from Expensify/melvin-revert-pr-90365
[CP Staging] Revert "Add enable-notifications banner above Concierge composer" (#90365)
2 parents 187d32f + 62cecd6 commit 80b1eb0

24 files changed

Lines changed: 29 additions & 392 deletions

src/ONYXKEYS.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -568,9 +568,6 @@ const ONYXKEYS = {
568568
/** Stores the information if mobile selection mode is active */
569569
RAM_ONLY_MOBILE_SELECTION_MODE: 'mobileSelectionMode',
570570

571-
/** Session-scoped flag: user dismissed the "enable notifications" banner in the Concierge chat */
572-
RAM_ONLY_HAS_DISMISSED_CONCIERGE_NOTIFICATION_BANNER: 'hasDismissedConciergeNotificationBanner',
573-
574571
NVP_PRIVATE_CANCELLATION_DETAILS: 'nvp_private_cancellationDetails',
575572

576573
/** Stores the information about duplicated workspace */
@@ -1587,7 +1584,6 @@ type OnyxValuesMapping = {
15871584
[ONYXKEYS.ADD_NEW_PERSONAL_CARD]: OnyxTypes.AddNewPersonalCard;
15881585
[ONYXKEYS.ASSIGN_CARD]: OnyxTypes.AssignCard;
15891586
[ONYXKEYS.RAM_ONLY_MOBILE_SELECTION_MODE]: boolean;
1590-
[ONYXKEYS.RAM_ONLY_HAS_DISMISSED_CONCIERGE_NOTIFICATION_BANNER]: boolean;
15911587
[ONYXKEYS.DUPLICATE_WORKSPACE]: OnyxTypes.DuplicateWorkspace;
15921588
[ONYXKEYS.COPY_POLICY_SETTINGS]: OnyxTypes.CopyPolicySettings;
15931589
[ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL]: string;

src/components/Banner.tsx

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ type BannerProps = {
5353

5454
/** Callback called when pressing the button */
5555
onButtonPress?: () => void;
56-
57-
/** Custom action content rendered in the right side of the banner. Overrides the configured `shouldShowButton` when provided. */
58-
children?: React.ReactNode;
5956
};
6057

6158
function Banner({
@@ -67,7 +64,6 @@ function Banner({
6764
onButtonPress,
6865
containerStyles,
6966
textStyles,
70-
children,
7167
shouldRenderHTML = false,
7268
shouldShowIcon = false,
7369
shouldShowCloseButton = false,
@@ -122,15 +118,14 @@ function Banner({
122118
</Text>
123119
))}
124120
</View>
125-
{children ??
126-
(shouldShowButton && (
127-
<Button
128-
success
129-
style={[styles.ph3]}
130-
text={translate('common.chatNow')}
131-
onPress={onButtonPress}
132-
/>
133-
))}
121+
{shouldShowButton && (
122+
<Button
123+
success
124+
style={[styles.ph3]}
125+
text={translate('common.chatNow')}
126+
onPress={onButtonPress}
127+
/>
128+
)}
134129
{shouldShowCloseButton && !!onClose && (
135130
<Tooltip text={translate('common.close')}>
136131
<PressableWithFeedback

src/languages/de.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,6 @@ const translations: TranslationDeepObject<typeof en> = {
508508
concierge: {
509509
collapseReasoning: 'Begründung einklappen',
510510
expandReasoning: 'Begründung erweitern',
511-
enableNotifications: {prompt: 'Möchten Sie benachrichtigt werden, wenn Concierge antwortet?', cta: 'Benachrichtigen'},
512511
},
513512
supportalNoAccess: {
514513
title: 'Nicht so schnell',

src/languages/en.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -528,10 +528,6 @@ const translations = {
528528
concierge: {
529529
collapseReasoning: 'Collapse reasoning',
530530
expandReasoning: 'Expand reasoning',
531-
enableNotifications: {
532-
prompt: 'Want to be notified when Concierge responds?',
533-
cta: 'Notify',
534-
},
535531
},
536532
supportalNoAccess: {
537533
title: 'Not so fast',

src/languages/es.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -460,10 +460,6 @@ const translations: TranslationDeepObject<typeof en> = {
460460
concierge: {
461461
collapseReasoning: 'Contraer razonamiento',
462462
expandReasoning: 'Expandir razonamiento',
463-
enableNotifications: {
464-
prompt: '¿Quieres que te avisemos cuando Concierge responda?',
465-
cta: 'Notificar',
466-
},
467463
},
468464
supportalNoAccess: {
469465
title: 'No tan rápido',

src/languages/fr.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,6 @@ const translations: TranslationDeepObject<typeof en> = {
508508
concierge: {
509509
collapseReasoning: 'Réduire le raisonnement',
510510
expandReasoning: 'Développer le raisonnement',
511-
enableNotifications: {prompt: 'Vous souhaitez être averti lorsque Concierge répond ?', cta: 'Notifier'},
512511
},
513512
supportalNoAccess: {
514513
title: 'Pas si vite',

src/languages/it.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,6 @@ const translations: TranslationDeepObject<typeof en> = {
508508
concierge: {
509509
collapseReasoning: 'Comprimi ragionamento',
510510
expandReasoning: 'Espandi ragionamento',
511-
enableNotifications: {prompt: 'Vuoi ricevere una notifica quando Concierge risponde?', cta: 'Notifica'},
512511
},
513512
supportalNoAccess: {
514513
title: 'Non così in fretta',

src/languages/ja.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -507,10 +507,6 @@ const translations: TranslationDeepObject<typeof en> = {
507507
concierge: {
508508
collapseReasoning: '推論を折りたたむ',
509509
expandReasoning: '推論を展開',
510-
enableNotifications: {
511-
prompt: 'Conciergeから返信があったときに通知を受け取りますか?',
512-
cta: '通知',
513-
},
514510
},
515511
supportalNoAccess: {
516512
title: 'ちょっと待ってください',

src/languages/nl.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,6 @@ const translations: TranslationDeepObject<typeof en> = {
507507
concierge: {
508508
collapseReasoning: 'Redenering inklappen',
509509
expandReasoning: 'Redenering uitklappen',
510-
enableNotifications: {prompt: 'Wil je een melding krijgen wanneer Concierge reageert?', cta: 'Melden'},
511510
},
512511
supportalNoAccess: {
513512
title: 'Niet zo snel',

src/languages/pl.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,6 @@ const translations: TranslationDeepObject<typeof en> = {
507507
concierge: {
508508
collapseReasoning: 'Zwiń rozumowanie',
509509
expandReasoning: 'Rozwiń rozumowanie',
510-
enableNotifications: {prompt: 'Chcesz otrzymywać powiadomienia, gdy Concierge odpowie?', cta: 'Powiadom'},
511510
},
512511
supportalNoAccess: {
513512
title: 'Nie tak szybko',

0 commit comments

Comments
 (0)