Skip to content

Commit

Permalink
Merge pull request #35643 from dukenv0307/fix/35479
Browse files Browse the repository at this point in the history
Fix extra padding of back button and tooltip
  • Loading branch information
dangrous authored Feb 5, 2024
2 parents 1747e86 + 8e0f773 commit 51303b5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/components/HeaderWithBackButton/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ function HeaderWithBackButton({
// Hover on some part of close icons will not work on Electron if dragArea is true
// https://github.com/Expensify/App/issues/29598
dataSet={{dragArea: false}}
style={[styles.headerBar, shouldShowBorderBottom && styles.borderBottom, shouldShowBackButton ? styles.pl0 : styles.pl5, shouldOverlay && StyleSheet.absoluteFillObject]}
style={[styles.headerBar, shouldShowBorderBottom && styles.borderBottom, shouldShowBackButton && styles.pl2, shouldOverlay && StyleSheet.absoluteFillObject]}
>
<View style={[styles.dFlex, styles.flexRow, styles.alignItemsCenter, styles.flexGrow1, styles.justifyContentBetween, styles.overflowHidden]}>
{shouldShowBackButton && (
Expand All @@ -87,7 +87,7 @@ function HeaderWithBackButton({
onBackButtonPress();
}
}}
style={[styles.LHNToggle]}
style={[styles.touchableButtonImage]}
role="button"
accessibilityLabel={translate('common.back')}
nativeID={CONST.BACK_BUTTON_NATIVE_ID}
Expand Down
6 changes: 3 additions & 3 deletions src/components/ReportHeaderSkeletonView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ function ReportHeaderSkeletonView({shouldAnimate = true, onBackButtonPress = ()
const {isSmallScreenWidth} = useWindowDimensions();

return (
<View style={[styles.appContentHeader]}>
<View style={[styles.appContentHeaderTitle]}>
<View style={[styles.appContentHeader, isSmallScreenWidth && styles.pl2]}>
<View style={[styles.appContentHeaderTitle, !isSmallScreenWidth && styles.pl5]}>
{isSmallScreenWidth && (
<PressableWithFeedback
onPress={onBackButtonPress}
style={[styles.LHNToggle]}
style={[styles.touchableButtonImage]}
role={CONST.ROLE.BUTTON}
accessibilityLabel={translate('common.back')}
>
Expand Down

0 comments on commit 51303b5

Please sign in to comment.