From bd869613609619920dcf291628745d13a551c6b2 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Mon, 1 Jun 2026 06:38:01 +0000 Subject: [PATCH 1/3] Update version to 9.3.89-6 (cherry picked from commit 6ba60d7133e85a0051b512b65a071db411625fb1) (cherry-picked to staging by mountiny) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NotificationServiceExtension/Info.plist | 2 +- ios/ShareViewController/Info.plist | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index ea097cb3c505..089347559a9b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -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" diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 920aa2dfd16b..0c091b5f9c8e 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -44,7 +44,7 @@ CFBundleVersion - 9.3.89.5 + 9.3.89.6 FullStory OrgId diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index 031c13d99d7c..d70ad595d74d 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.3.89 CFBundleVersion - 9.3.89.5 + 9.3.89.6 NSExtension NSExtensionPointIdentifier diff --git a/ios/ShareViewController/Info.plist b/ios/ShareViewController/Info.plist index 4adb4e78b525..d38626ef9164 100644 --- a/ios/ShareViewController/Info.plist +++ b/ios/ShareViewController/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.3.89 CFBundleVersion - 9.3.89.5 + 9.3.89.6 NSExtension NSExtensionAttributes diff --git a/package-lock.json b/package-lock.json index fe692e735fcd..51b8c7004fa2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "9.3.89-5", + "version": "9.3.89-6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "9.3.89-5", + "version": "9.3.89-6", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 50d24a338c20..2e3bc2bfdcf1 100644 --- a/package.json +++ b/package.json @@ -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.", From c19efbc7dad0dd17270761f17bdb224ff2653137 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Mon, 1 Jun 2026 06:38:49 +0000 Subject: [PATCH 2/3] Update Mobile-Expensify submodule version to 9.3.89-6 --- Mobile-Expensify | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mobile-Expensify b/Mobile-Expensify index 0ab28c31df63..cb5f79c855fc 160000 --- a/Mobile-Expensify +++ b/Mobile-Expensify @@ -1 +1 @@ -Subproject commit 0ab28c31df638030eb7fa144184a03144a4967fa +Subproject commit cb5f79c855fc89cec9963ed5c099e883d2969889 From 0787c8d515c21998d81d39f2156fb59a9ff71ea0 Mon Sep 17 00:00:00 2001 From: Vit Horacek <36083550+mountiny@users.noreply.github.com> Date: Mon, 1 Jun 2026 08:33:16 +0200 Subject: [PATCH 3/3] Merge pull request #92140 from Expensify/melvin-revert-pr-90365 [CP Staging] Revert "Add enable-notifications banner above Concierge composer" (#90365) (cherry picked from commit 80b1eb090cbaec8e753d2f82dfc899bbd73fbfb4) (cherry-picked to staging by mountiny) --- src/ONYXKEYS.ts | 4 - src/components/Banner.tsx | 21 ++--- src/languages/de.ts | 1 - src/languages/en.ts | 4 - src/languages/es.ts | 4 - src/languages/fr.ts | 1 - src/languages/it.ts | 1 - src/languages/ja.ts | 4 - src/languages/nl.ts | 1 - src/languages/pl.ts | 1 - src/languages/pt-BR.ts | 1 - src/languages/zh-hans.ts | 4 - .../LocalNotification/BrowserNotifications.ts | 27 ++++-- .../notificationPermission/index.native.ts | 8 -- .../notificationPermission/index.ts | 33 -------- .../notificationPermission/types.ts | 9 -- .../actions/ConciergeNotificationBanner.ts | 11 --- .../report/EnableNotificationsBanner.tsx | 63 -------------- src/pages/inbox/report/ReportFooter.tsx | 14 +--- .../useShouldShowEnableNotificationsBanner.ts | 36 -------- src/setup/index.ts | 1 - .../ConciergeNotificationBannerTest.ts | 24 ------ tests/unit/EnableNotificationsBannerTest.tsx | 82 ------------------- ...houldShowEnableNotificationsBanner.test.ts | 66 --------------- 24 files changed, 29 insertions(+), 392 deletions(-) delete mode 100644 src/libs/Notification/notificationPermission/index.native.ts delete mode 100644 src/libs/Notification/notificationPermission/index.ts delete mode 100644 src/libs/Notification/notificationPermission/types.ts delete mode 100644 src/libs/actions/ConciergeNotificationBanner.ts delete mode 100644 src/pages/inbox/report/EnableNotificationsBanner.tsx delete mode 100644 src/pages/inbox/report/useShouldShowEnableNotificationsBanner.ts delete mode 100644 tests/actions/ConciergeNotificationBannerTest.ts delete mode 100644 tests/unit/EnableNotificationsBannerTest.tsx delete mode 100644 tests/unit/hooks/useShouldShowEnableNotificationsBanner.test.ts diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts index 2bcf9e3f036d..a63f5503f492 100755 --- a/src/ONYXKEYS.ts +++ b/src/ONYXKEYS.ts @@ -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; diff --git a/src/components/Banner.tsx b/src/components/Banner.tsx index ad2ca1595e65..f652653f910f 100644 --- a/src/components/Banner.tsx +++ b/src/components/Banner.tsx @@ -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({ ))} - {children ?? - (shouldShowButton && ( -