From 7e667a099036692aa15f4eec5ad8e0d2805e1ade Mon Sep 17 00:00:00 2001 From: OSBotify Date: Wed, 19 Feb 2025 18:46:07 +0000 Subject: [PATCH 1/2] Update version to 9.1.1-4 (cherry picked from commit c75884e2acac4021e3e2b785f8c8c4578b6a8705) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- ios/NotificationServiceExtension/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 e245a84d43ed..84b63d9009da 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 1009010103 - versionName "9.1.1-3" + versionCode 1009010104 + versionName "9.1.1-4" // 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 9166912b8567..946285664484 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -44,7 +44,7 @@ CFBundleVersion - 9.1.1.3 + 9.1.1.4 FullStory OrgId diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 14ddf0f3daff..964afdf241cf 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 9.1.1.3 + 9.1.1.4 diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index a6ce9dad1f72..7c4b5005892c 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.1.1 CFBundleVersion - 9.1.1.3 + 9.1.1.4 NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index d96370ea7984..ad730b32bfc0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "9.1.1-3", + "version": "9.1.1-4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "9.1.1-3", + "version": "9.1.1-4", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 3761e65855c0..fd27bdd64551 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "9.1.1-3", + "version": "9.1.1-4", "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 f03eb34be3883037b004d4fca41bcc6ea4584724 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Wed, 19 Feb 2025 11:43:12 -0700 Subject: [PATCH 2/2] Update version to 9.1.1-4 (cherry picked from commit c75884e) (CP triggered by luacmartins) --- .../SearchPageHeader/SearchPageHeader.tsx | 4 +- src/pages/Search/SearchPageNarrow.tsx | 38 ++++++++++--------- src/styles/index.ts | 2 +- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/src/components/Search/SearchPageHeader/SearchPageHeader.tsx b/src/components/Search/SearchPageHeader/SearchPageHeader.tsx index f79717930266..cef3d9a8301a 100644 --- a/src/components/Search/SearchPageHeader/SearchPageHeader.tsx +++ b/src/components/Search/SearchPageHeader/SearchPageHeader.tsx @@ -323,7 +323,7 @@ function SearchPageHeader({queryJSON, searchName, searchRouterListVisible, hideS }, [allCards, currencyList, hideProductTrainingTooltip, personalDetails, policyCategories, policyTagsLists, queryJSON, reports, taxRates]); const InputRightComponent = useMemo(() => { - return headerButtonsOptions.length > 0 ? ( + return headerButtonsOptions.length > 0 && (!shouldUseNarrowLayout || selectionMode?.isEnabled) ? ( null} shouldAlwaysShowDropdownMenu @@ -363,6 +363,8 @@ function SearchPageHeader({queryJSON, searchName, searchRouterListVisible, hideS styles.productTrainingTooltipWrapper, styles.searchAutocompleteInputResults, translate, + selectionMode, + shouldUseNarrowLayout, ]); if (shouldUseNarrowLayout && selectionMode?.isEnabled) { diff --git a/src/pages/Search/SearchPageNarrow.tsx b/src/pages/Search/SearchPageNarrow.tsx index 917b6daa5e32..0154ca4c0ccd 100644 --- a/src/pages/Search/SearchPageNarrow.tsx +++ b/src/pages/Search/SearchPageNarrow.tsx @@ -137,26 +137,30 @@ function SearchPageNarrow({queryJSON, policyID, searchName}: SearchPageBottomTab /> - - { - setSearchRouterListVisible(false); - }} - onSearchRouterFocus={() => { - topBarOffset.set(StyleUtils.searchHeaderDefaultOffset); - setSearchRouterListVisible(true); - }} - /> - {!searchRouterListVisible && ( - + + { - topBarOffset.set(withTiming(StyleUtils.searchHeaderDefaultOffset, {duration: ANIMATION_DURATION_IN_MS})); + searchRouterListVisible={searchRouterListVisible} + hideSearchRouterList={() => { + setSearchRouterListVisible(false); + }} + onSearchRouterFocus={() => { + topBarOffset.set(StyleUtils.searchHeaderDefaultOffset); + setSearchRouterListVisible(true); }} /> - )} + + + {!searchRouterListVisible && ( + { + topBarOffset.set(withTiming(StyleUtils.searchHeaderDefaultOffset, {duration: ANIMATION_DURATION_IN_MS})); + }} + /> + )} + diff --git a/src/styles/index.ts b/src/styles/index.ts index 5661e0eb40e4..927fd9252af0 100644 --- a/src/styles/index.ts +++ b/src/styles/index.ts @@ -3768,7 +3768,7 @@ const styles = (theme: ThemeColors) => narrowSearchHeaderStyle: { paddingTop: 1, - flex: 1, + backgroundColor: theme.appBG, }, narrowSearchRouterInactiveStyle: {