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 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.", 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 && ( -