diff --git a/Mobile-Expensify b/Mobile-Expensify index 0e7081b240aa..ef3905e71ade 160000 --- a/Mobile-Expensify +++ b/Mobile-Expensify @@ -1 +1 @@ -Subproject commit 0e7081b240aa74817fc2104c2829b2b31346c98d +Subproject commit ef3905e71adea058793c1411ade1bd5bbb3873eb diff --git a/android/app/build.gradle b/android/app/build.gradle index c1efaa5568ba..48df0aa85f2b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -114,8 +114,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1009015609 - versionName "9.1.56-9" + versionCode 1009015610 + versionName "9.1.56-10" // 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 e268bb21e0a6..50ce49c4acd3 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -44,7 +44,7 @@ CFBundleVersion - 9.1.56.9 + 9.1.56.10 FullStory OrgId diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index 83b40e22174d..a9900853361d 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.1.55 CFBundleVersion - 9.1.56.9 + 9.1.56.10 NSExtension NSExtensionPointIdentifier diff --git a/ios/ShareViewController/Info.plist b/ios/ShareViewController/Info.plist index 8e0c3512089d..e64709f40548 100644 --- a/ios/ShareViewController/Info.plist +++ b/ios/ShareViewController/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.1.55 CFBundleVersion - 9.1.56.9 + 9.1.56.10 NSExtension NSExtensionAttributes diff --git a/package-lock.json b/package-lock.json index ba4b37920bdf..6bad9afdf952 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "9.1.56-9", + "version": "9.1.56-10", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "9.1.56-9", + "version": "9.1.56-10", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 259e8541f5cb..3d29b3f044fd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "9.1.56-9", + "version": "9.1.56-10", "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/pages/Search/EmptySearchView.tsx b/src/pages/Search/EmptySearchView.tsx index 72e91ad2dbda..25add64aff1a 100644 --- a/src/pages/Search/EmptySearchView.tsx +++ b/src/pages/Search/EmptySearchView.tsx @@ -91,6 +91,8 @@ function EmptySearchView({hash, type, groupBy, hasResults}: EmptySearchViewProps const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID, {canBeMissing: true}); const [activePolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${activePolicyID}`, {canBeMissing: true}); + const groupPoliciesWithChatEnabled = getGroupPaidPoliciesWithExpenseChatEnabled(); + const shouldRedirectToExpensifyClassic = useMemo(() => { return areAllGroupPoliciesExpenseChatDisabled((allPolicies as OnyxCollection) ?? {}); }, [allPolicies]); @@ -213,13 +215,12 @@ function EmptySearchView({hash, type, groupBy, hasResults}: EmptySearchViewProps }, ] : []), - ...(canUseTableReportView && !!Object.keys(allPolicies ?? {})?.length + ...(canUseTableReportView && groupPoliciesWithChatEnabled.length > 0 ? [ { buttonText: translate('quickAction.createReport'), buttonAction: () => { interceptAnonymousUser(() => { - const groupPoliciesWithChatEnabled = getGroupPaidPoliciesWithExpenseChatEnabled(); let workspaceIDForReportCreation: string | undefined; if (activePolicy && activePolicy.isPolicyExpenseChatEnabled && isPaidGroupPolicy(activePolicy)) { @@ -360,7 +361,7 @@ function EmptySearchView({hash, type, groupBy, hasResults}: EmptySearchViewProps introSelected?.choice, hasSeenTour, canUseTableReportView, - allPolicies, + groupPoliciesWithChatEnabled, activePolicy, activePolicyID, currentUserPersonalDetails,