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

Missing bottom padding fix #40912

Merged
merged 5 commits into from
May 10, 2024
Merged

Missing bottom padding fix #40912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
34a857a
added missing padding
lukemorawski Apr 24, 2024
493a1a9
Merge branch 'main' of https://github.com/Expensify/App into 40827-mi…
MrMuzyk May 6, 2024
04a41dc
fix: more padding fixes
MrMuzyk May 7, 2024
e940f48
Merge branch 'main' of https://github.com/Expensify/App into 40827-mi…
MrMuzyk May 9, 2024
ddb7755
fix: report virtual card fraud page fix
MrMuzyk May 9, 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
2 changes: 1 addition & 1 deletion src/pages/settings/AboutPage/ConsolePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ function ConsolePage({capturedLogs, shouldStoreLogs}: ConsolePageProps) {
success
text={translate('initialSettingsPage.debugConsole.execute')}
onPress={executeArbitraryCode}
style={[styles.mt5]}
style={[styles.mv5]}
large
/>
</View>
Expand Down
14 changes: 8 additions & 6 deletions src/pages/settings/Wallet/ReportCardLostPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import SingleOptionSelector from '@components/SingleOptionSelector';
import Text from '@components/Text';
import useLocalize from '@hooks/useLocalize';
import usePrevious from '@hooks/usePrevious';
import useStyledSafeAreaInsets from '@hooks/useStyledSafeAreaInsets';
import useThemeStyles from '@hooks/useThemeStyles';
import Navigation from '@libs/Navigation/Navigation';
import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
Expand Down Expand Up @@ -92,6 +93,8 @@ function ReportCardLostPage({

const prevIsLoading = usePrevious(formData?.isLoading);

const {paddingBottom} = useStyledSafeAreaInsets();

const formattedAddress = PersonalDetailsUtils.getFormattedAddress(privatePersonalDetails ?? {});

useEffect(() => {
Expand Down Expand Up @@ -159,11 +162,11 @@ function ReportCardLostPage({
title={translate('reportCardLostOrDamaged.screenTitle')}
onBackButtonPress={handleBackButtonPress}
/>
<View style={[styles.flex1, styles.justifyContentBetween, styles.pt3]}>
<View style={[styles.flex1, styles.justifyContentBetween, styles.pt3, styles.mh5, !paddingBottom ? styles.pb5 : null]}>
{isReasonConfirmed ? (
<>
<View>
<Text style={[styles.textHeadline, styles.mb3, styles.mh5]}>{translate('reportCardLostOrDamaged.confirmAddressTitle')}</Text>
<Text style={[styles.textHeadline, styles.mb3]}>{translate('reportCardLostOrDamaged.confirmAddressTitle')}</Text>
<MenuItemWithTopDescription
title={formattedAddress}
description={translate('reportCardLostOrDamaged.address')}
Expand All @@ -172,9 +175,9 @@ function ReportCardLostPage({
numberOfLinesTitle={2}
/>
{isDamaged ? (
<Text style={[styles.mt3, styles.mh5]}>{translate('reportCardLostOrDamaged.cardDamagedInfo')}</Text>
<Text style={[styles.mt3]}>{translate('reportCardLostOrDamaged.cardDamagedInfo')}</Text>
) : (
<Text style={[styles.mt3, styles.mh5]}>{translate('reportCardLostOrDamaged.cardLostOrStolenInfo')}</Text>
<Text style={[styles.mt3]}>{translate('reportCardLostOrDamaged.cardLostOrStolenInfo')}</Text>
)}
</View>
<FormAlertWithSubmitButton
Expand All @@ -187,7 +190,7 @@ function ReportCardLostPage({
</>
) : (
<>
<View style={styles.mh5}>
<View>
<Text style={[styles.textHeadline, styles.mr5]}>{translate('reportCardLostOrDamaged.reasonTitle')}</Text>
<SingleOptionSelector
options={OPTIONS}
Expand All @@ -200,7 +203,6 @@ function ReportCardLostPage({
onSubmit={handleSubmitFirstStep}
message="reportCardLostOrDamaged.reasonError"
buttonText={translate('reportCardLostOrDamaged.nextButtonLabel')}
containerStyles={[styles.m5]}
/>
</>
)}
Expand Down
3 changes: 3 additions & 0 deletions src/pages/settings/Wallet/TransferBalancePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import ScrollView from '@components/ScrollView';
import Text from '@components/Text';
import useLocalize from '@hooks/useLocalize';
import useNetwork from '@hooks/useNetwork';
import useStyledSafeAreaInsets from '@hooks/useStyledSafeAreaInsets';
import useThemeStyles from '@hooks/useThemeStyles';
import * as CurrencyUtils from '@libs/CurrencyUtils';
import * as ErrorUtils from '@libs/ErrorUtils';
Expand Down Expand Up @@ -51,6 +52,7 @@ function TransferBalancePage({bankAccountList, fundList, userWallet, walletTrans
const styles = useThemeStyles();
const {numberFormat, translate} = useLocalize();
const {isOffline} = useNetwork();
const {paddingBottom} = useStyledSafeAreaInsets();
const paymentCardList = fundList ?? {};

const paymentTypes = [
Expand Down Expand Up @@ -217,6 +219,7 @@ function TransferBalancePage({bankAccountList, fundList, userWallet, walletTrans
isDisabled={isButtonDisabled || isOffline}
message={errorMessage}
isAlertVisible={!isEmptyObject(errorMessage)}
containerStyles={[styles.ph5, !paddingBottom ? styles.pb5 : null]}
/>
</View>
</FullPageNotFoundView>
Expand Down
5 changes: 4 additions & 1 deletion src/pages/tasks/NewTaskPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
import ScreenWrapper from '@components/ScreenWrapper';
import ScrollView from '@components/ScrollView';
import useLocalize from '@hooks/useLocalize';
import useStyledSafeAreaInsets from '@hooks/useStyledSafeAreaInsets';
import useThemeStyles from '@hooks/useThemeStyles';
import * as LocalePhoneNumber from '@libs/LocalePhoneNumber';
import Navigation from '@libs/Navigation/Navigation';
Expand Down Expand Up @@ -56,6 +57,8 @@ function NewTaskPage({task, reports, personalDetails}: NewTaskPageProps) {
const hasDestinationError = task?.skipConfirmation && !task?.parentReportID;
const isAllowedToCreateTask = useMemo(() => isEmptyObject(parentReport) || ReportUtils.isAllowedToComment(parentReport), [parentReport]);

const {paddingBottom} = useStyledSafeAreaInsets();

useEffect(() => {
setErrorMessage('');

Expand Down Expand Up @@ -201,7 +204,7 @@ function NewTaskPage({task, reports, personalDetails}: NewTaskPageProps) {
onSubmit={onSubmit}
enabledWhenOffline
buttonText={translate('newTaskPage.confirmTask')}
containerStyles={[styles.mh0, styles.mt5, styles.flex1, styles.ph5]}
containerStyles={[styles.mh0, styles.mt5, styles.flex1, styles.ph5, !paddingBottom ? styles.mb5 : null]}
/>
</View>
</ScrollView>
Expand Down
Loading