Skip to content

🍒 Cherry pick PR #57113 to staging 🍒 #57129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luacmartins merged 2 commits into from
Feb 19, 2025
Merged

🍒 Cherry pick PR #57113 to staging 🍒 #57129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e667a0
Update version to 9.1.1-4
OSBotify Feb 19, 2025
f03eb34
Update version to 9.1.1-4 (cherry picked from commit c75884e)
luacmartins Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensify/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>9.1.1.3</string>
<string>9.1.1.4</string>
<key>FullStory</key>
<dict>
<key>OrgId</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensifyTests/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>9.1.1.3</string>
<string>9.1.1.4</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion ios/NotificationServiceExtension/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<key>CFBundleShortVersionString</key>
<string>9.1.1</string>
<key>CFBundleVersion</key>
<string>9.1.1.3</string>
<string>9.1.1.4</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionPointIdentifier</key>
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.",
Expand Down
4 changes: 3 additions & 1 deletion src/components/Search/SearchPageHeader/SearchPageHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) ? (
<ButtonWithDropdownMenu
onPress={() => null}
shouldAlwaysShowDropdownMenu
Expand Down Expand Up @@ -363,6 +363,8 @@ function SearchPageHeader({queryJSON, searchName, searchRouterListVisible, hideS
styles.productTrainingTooltipWrapper,
styles.searchAutocompleteInputResults,
translate,
selectionMode,
shouldUseNarrowLayout,
]);

if (shouldUseNarrowLayout && selectionMode?.isEnabled) {
Expand Down
38 changes: 21 additions & 17 deletions src/pages/Search/SearchPageNarrow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,26 +137,30 @@ function SearchPageNarrow({queryJSON, policyID, searchName}: SearchPageBottomTab
/>
</View>
<View style={[styles.flex1]}>
<Animated.View style={[topBarAnimatedStyle, !searchRouterListVisible && styles.narrowSearchRouterInactiveStyle, styles.narrowSearchHeaderStyle]}>
<SearchPageHeader
queryJSON={queryJSON}
searchRouterListVisible={searchRouterListVisible}
hideSearchRouterList={() => {
setSearchRouterListVisible(false);
}}
onSearchRouterFocus={() => {
topBarOffset.set(StyleUtils.searchHeaderDefaultOffset);
setSearchRouterListVisible(true);
}}
/>
{!searchRouterListVisible && (
<SearchStatusBar
<Animated.View style={[topBarAnimatedStyle, !searchRouterListVisible && styles.narrowSearchRouterInactiveStyle, styles.flex1, styles.bgTransparent]}>
<View style={[styles.narrowSearchHeaderStyle]}>
<SearchPageHeader
queryJSON={queryJSON}
onStatusChange={() => {
topBarOffset.set(withTiming(StyleUtils.searchHeaderDefaultOffset, {duration: ANIMATION_DURATION_IN_MS}));
searchRouterListVisible={searchRouterListVisible}
hideSearchRouterList={() => {
setSearchRouterListVisible(false);
}}
onSearchRouterFocus={() => {
topBarOffset.set(StyleUtils.searchHeaderDefaultOffset);
setSearchRouterListVisible(true);
}}
/>
)}
</View>
<View style={[styles.appBG]}>
{!searchRouterListVisible && (
<SearchStatusBar
queryJSON={queryJSON}
onStatusChange={() => {
topBarOffset.set(withTiming(StyleUtils.searchHeaderDefaultOffset, {duration: ANIMATION_DURATION_IN_MS}));
}}
/>
)}
</View>
</Animated.View>
</View>
</View>
Expand Down
2 changes: 1 addition & 1 deletion src/styles/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3768,7 +3768,7 @@ const styles = (theme: ThemeColors) =>

narrowSearchHeaderStyle: {
paddingTop: 1,
flex: 1,
backgroundColor: theme.appBG,
},

narrowSearchRouterInactiveStyle: {
Expand Down