Skip to content
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

Fix - Concierge - Concierge header has extra bottom padding #53942

Merged
merged 3 commits into from
Dec 23, 2024
Merged

Fix - Concierge - Concierge header has extra bottom padding #53942

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
170c177
fix concierge header extra spacing
FitseTLT Dec 10, 2024
cdb9c06
minor fix
FitseTLT Dec 12, 2024
285aba5
Merge branch 'main' into fix-concierge-extra-spacing-bug
FitseTLT Dec 13, 2024
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
9 changes: 7 additions & 2 deletions src/pages/home/HeaderView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,12 @@ function HeaderView({report, parentReportAction, reportID, onNavigationMenuButto
/>
);

const freeTrialButton = <FreeTrial pressable />;
const freeTrialButton = (
<FreeTrial
pressable
addSpacing={shouldUseNarrowLayout}
/>
);

const renderAdditionalText = () => {
if (shouldShowSubtitle() || isPersonalExpenseChat || !policyName || !isEmptyObject(parentNavigationSubtitleData) || isSelfDM) {
Expand Down Expand Up @@ -310,7 +315,7 @@ function HeaderView({report, parentReportAction, reportID, onNavigationMenuButto
)}
</View>
{!isLoading && canJoin && shouldUseNarrowLayout && <View style={[styles.ph5, styles.pb2]}>{joinButton}</View>}
{!isLoading && isChatUsedForOnboarding && shouldUseNarrowLayout && <View style={[styles.pb3, styles.ph5]}>{freeTrialButton}</View>}
{!isLoading && isChatUsedForOnboarding && shouldUseNarrowLayout && freeTrialButton}
</View>
);
}
Expand Down
10 changes: 8 additions & 2 deletions src/pages/settings/Subscription/FreeTrial.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import React, {useEffect, useState} from 'react';
import type {StyleProp, ViewStyle} from 'react-native';
import {View} from 'react-native';
import {useOnyx} from 'react-native-onyx';
import Badge from '@components/Badge';
import Button from '@components/Button';
import useNetwork from '@hooks/useNetwork';
import useThemeStyles from '@hooks/useThemeStyles';
import Navigation from '@libs/Navigation/Navigation';
import * as SubscriptionUtils from '@libs/SubscriptionUtils';
import * as Expensicons from '@src/components/Icon/Expensicons';
Expand All @@ -13,9 +15,11 @@ import ROUTES from '@src/ROUTES';
type FreeTrialProps = {
badgeStyles?: StyleProp<ViewStyle>;
pressable?: boolean;
addSpacing?: boolean;
};

function FreeTrial({badgeStyles, pressable = false}: FreeTrialProps) {
function FreeTrial({badgeStyles, pressable = false, addSpacing = false}: FreeTrialProps) {
const styles = useThemeStyles();
const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
const [firstDayFreeTrial] = useOnyx(ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL);
const [lastDayFreeTrial] = useOnyx(ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL);
Expand All @@ -35,7 +39,7 @@ function FreeTrial({badgeStyles, pressable = false}: FreeTrialProps) {
return null;
}

return pressable ? (
const freeTrial = pressable ? (
<Button
icon={Expensicons.Star}
success
Expand All @@ -49,6 +53,8 @@ function FreeTrial({badgeStyles, pressable = false}: FreeTrialProps) {
badgeStyles={badgeStyles}
/>
);

return addSpacing ? <View style={[styles.pb3, styles.ph5]}>{freeTrial}</View> : freeTrial;
}

FreeTrial.displayName = 'FreeTrial';
Expand Down
Loading