Skip to content

Commit 980163f

Browse files
authored
Merge pull request Expensify#63247 from software-mansion-labs/nav/fix-workspaces-list-page-header-padding
Workspaces - Green loading line overlaps with + New workspace button
2 parents 516eeb7 + d55c8d4 commit 980163f

5 files changed

Lines changed: 7 additions & 19 deletions

File tree

src/pages/Search/SearchPageNarrow.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ function SearchPageNarrow({queryJSON, headerButtonsOptions, currentSearchResults
158158
</View>
159159
<View style={[styles.flex1]}>
160160
<Animated.View style={[topBarAnimatedStyle, !searchRouterListVisible && styles.narrowSearchRouterInactiveStyle, styles.flex1, styles.bgTransparent]}>
161-
<View style={[styles.narrowSearchHeaderStyle, styles.flex1]}>
161+
<View style={[styles.flex1, styles.pt2, styles.appBG]}>
162162
<SearchPageHeader
163163
queryJSON={queryJSON}
164164
searchRouterListVisible={searchRouterListVisible}

src/pages/Search/SearchTypeMenu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ function SearchTypeMenu({queryJSON}: SearchTypeMenuProps) {
261261
))}
262262
{shouldShowSavedSearchesMenuItemTitle && (
263263
<View>
264-
<Text style={[styles.sectionTitle, styles.pb1]}>{translate('search.savedSearchesMenuItemTitle')}</Text>
264+
<Text style={styles.sectionTitle}>{translate('search.savedSearchesMenuItemTitle')}</Text>
265265
{renderSavedSearchesSection(savedSearchesMenuItems)}
266266
<DeleteConfirmModal />
267267
</View>

src/pages/home/sidebar/SidebarLinks.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ function SidebarLinks({insets, optionListItems, isLoading, priorityMode = CONST.
8484
const viewMode = priorityMode === CONST.PRIORITY_MODE.GSD ? CONST.OPTION_MODE.COMPACT : CONST.OPTION_MODE.DEFAULT;
8585

8686
// eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
87-
const contentContainerStyles = useMemo(() => StyleSheet.flatten([styles.sidebarListContainer, {paddingBottom: StyleUtils.getSafeAreaMargins(insets).marginBottom}]), [insets]);
87+
const contentContainerStyles = useMemo(() => StyleSheet.flatten([styles.pt2, {paddingBottom: StyleUtils.getSafeAreaMargins(insets).marginBottom}]), [insets]);
8888

8989
return (
9090
<View style={[styles.flex1, styles.h100]}>

src/pages/workspace/WorkspacesListPage.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ function WorkspacesListPage() {
318318

319319
const listHeaderComponent = useCallback(() => {
320320
if (isLessThanMediumScreen) {
321-
return <View style={styles.mt3} />;
321+
return <View style={styles.mt2} />;
322322
}
323323

324324
return (
@@ -490,7 +490,7 @@ function WorkspacesListPage() {
490490
<FullScreenLoadingIndicator style={[styles.flex1, styles.pRelative]} />
491491
) : (
492492
<ScrollView
493-
contentContainerStyle={styles.pt3}
493+
contentContainerStyle={styles.pt2}
494494
addBottomSafeAreaPadding
495495
>
496496
<View style={[styles.flex1, isLessThanMediumScreen ? styles.workspaceSectionMobile : styles.workspaceSection]}>
@@ -524,7 +524,7 @@ function WorkspacesListPage() {
524524
>
525525
<View style={styles.flex1}>
526526
<TopBar breadcrumbLabel={translate('common.workspaces')}>{!shouldUseNarrowLayout && <View style={[styles.pr2]}>{getHeaderButton()}</View>}</TopBar>
527-
{shouldUseNarrowLayout && <View style={[styles.ph5]}>{getHeaderButton()}</View>}
527+
{shouldUseNarrowLayout && <View style={[styles.ph5, styles.pt2]}>{getHeaderButton()}</View>}
528528
<FlatList
529529
data={workspaces}
530530
renderItem={getMenuItem}

src/styles/index.ts

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1815,11 +1815,6 @@ const styles = (theme: ThemeColors) =>
18151815
lineHeight: 20,
18161816
},
18171817

1818-
sidebarListContainer: {
1819-
...spacing.pt3,
1820-
paddingBottom: 4,
1821-
},
1822-
18231818
sidebarListItem: {
18241819
justifyContent: 'center',
18251820
textDecorationLine: 'none',
@@ -3069,8 +3064,7 @@ const styles = (theme: ThemeColors) =>
30693064
},
30703065

30713066
sectionTitle: {
3072-
...spacing.pt2,
3073-
...spacing.pb4,
3067+
...spacing.pv2,
30743068
...spacing.ph2,
30753069
fontSize: 13,
30763070
...FontUtils.fontFamily.platform.EXP_NEUE,
@@ -3857,12 +3851,6 @@ const styles = (theme: ThemeColors) =>
38573851
justifyContent: 'flex-start',
38583852
},
38593853

3860-
narrowSearchHeaderStyle: {
3861-
flex: 1,
3862-
paddingTop: 12,
3863-
backgroundColor: theme.appBG,
3864-
},
3865-
38663854
narrowSearchRouterInactiveStyle: {
38673855
left: 0,
38683856
right: 0,

0 commit comments

Comments
 (0)