Merge pull request #92163 from Expensify/cherry-pick-staging-92140-26739173982-1

🍒 Cherry pick PR #92140 to staging 🍒

Author: mountiny

Mobile-Expensify

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009038905
-        versionName "9.3.89-5"
+        versionCode 1009038906
+        versionName "9.3.89-6"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

android/app/build.gradle

@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.3.89.5</string>
+	<string>9.3.89.6</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensify/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.3.89</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.89.5</string>
+	<string>9.3.89.6</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.3.89</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.89.5</string>
+	<string>9.3.89.6</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

ios/ShareViewController/Info.plist

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.3.89-5",
+  "version": "9.3.89-6",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

package-lock.json

@@ -568,9 +568,6 @@ const ONYXKEYS = {
     /** Stores the information if mobile selection mode is active */
     RAM_ONLY_MOBILE_SELECTION_MODE: 'mobileSelectionMode',
 
-    /** Session-scoped flag: user dismissed the "enable notifications" banner in the Concierge chat */
-    RAM_ONLY_HAS_DISMISSED_CONCIERGE_NOTIFICATION_BANNER: 'hasDismissedConciergeNotificationBanner',
-
     NVP_PRIVATE_CANCELLATION_DETAILS: 'nvp_private_cancellationDetails',
 
     /** Stores the information about duplicated workspace */
@@ -1566,7 +1563,6 @@ type OnyxValuesMapping = {
     [ONYXKEYS.ADD_NEW_PERSONAL_CARD]: OnyxTypes.AddNewPersonalCard;
     [ONYXKEYS.ASSIGN_CARD]: OnyxTypes.AssignCard;
     [ONYXKEYS.RAM_ONLY_MOBILE_SELECTION_MODE]: boolean;
-    [ONYXKEYS.RAM_ONLY_HAS_DISMISSED_CONCIERGE_NOTIFICATION_BANNER]: boolean;
     [ONYXKEYS.DUPLICATE_WORKSPACE]: OnyxTypes.DuplicateWorkspace;
     [ONYXKEYS.COPY_POLICY_SETTINGS]: OnyxTypes.CopyPolicySettings;
     [ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL]: string;

package.json

@@ -53,9 +53,6 @@ type BannerProps = {
 
     /** Callback called when pressing the button */
     onButtonPress?: () => void;
-
-    /** Custom action content rendered in the right side of the banner. Overrides the configured `shouldShowButton` when provided. */
-    children?: React.ReactNode;
 };
 
 function Banner({
@@ -67,7 +64,6 @@ function Banner({
     onButtonPress,
     containerStyles,
     textStyles,
-    children,
     shouldRenderHTML = false,
     shouldShowIcon = false,
     shouldShowCloseButton = false,
@@ -122,15 +118,14 @@ function Banner({
                                     </Text>
                                 ))}
                         </View>
-                        {children ??
-                            (shouldShowButton && (
-                                <Button
-                                    success
-                                    style={[styles.ph3]}
-                                    text={translate('common.chatNow')}
-                                    onPress={onButtonPress}
-                                />
-                            ))}
+                        {shouldShowButton && (
+                            <Button
+                                success
+                                style={[styles.ph3]}
+                                text={translate('common.chatNow')}
+                                onPress={onButtonPress}
+                            />
+                        )}
                         {shouldShowCloseButton && !!onClose && (
                             <Tooltip text={translate('common.close')}>
                                 <PressableWithFeedback

src/ONYXKEYS.ts

@@ -508,7 +508,6 @@ const translations: TranslationDeepObject<typeof en> = {
     concierge: {
         collapseReasoning: 'Begründung einklappen',
         expandReasoning: 'Begründung erweitern',
-        enableNotifications: {prompt: 'Möchten Sie benachrichtigt werden, wenn Concierge antwortet?', cta: 'Benachrichtigen'},
     },
     supportalNoAccess: {
         title: 'Nicht so schnell',