Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ function PaymentCardCurrencyModal({isVisible, currencies, currentCurrency = CONS
<ScreenWrapper
style={styles.pb0}
includePaddingTop={false}
includeSafeAreaPaddingBottom={false}
testID={PaymentCardCurrencyModal.displayName}
>
<HeaderWithBackButton
Expand Down
1 change: 0 additions & 1 deletion src/components/AmountPicker/AmountSelectorModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ function AmountSelectorModal({value, description = '', onValueSelected, isVisibl
>
<ScreenWrapper
includePaddingTop={false}
includeSafeAreaPaddingBottom={false}
testID={AmountSelectorModal.displayName}
shouldEnableMaxHeight
style={[styles.pb0]}
Expand Down
1 change: 0 additions & 1 deletion src/components/AvatarCropModal/AvatarCropModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,6 @@ function AvatarCropModal({imageUri = '', imageName = '', imageType = '', onClose
<ScreenWrapper
style={[styles.pb0]}
includePaddingTop={false}
includeSafeAreaPaddingBottom={false}
testID={AvatarCropModal.displayName}
>
{shouldUseNarrowLayout && <HeaderGap />}
Expand Down
1 change: 0 additions & 1 deletion src/components/CountryPicker/CountrySelectorModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ function CountrySelectorModal({isVisible, currentCountry, onCountrySelected, onC
<ScreenWrapper
style={[styles.pb0]}
includePaddingTop={false}
includeSafeAreaPaddingBottom={false}
testID={CountrySelectorModal.displayName}
>
<HeaderWithBackButton
Expand Down
1 change: 0 additions & 1 deletion src/components/CurrencyPicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ function CurrencyPicker({label, value, errorText, headerContent, excludeCurrenci
<ScreenWrapper
style={[styles.pb0]}
includePaddingTop={false}
includeSafeAreaPaddingBottom
testID={CurrencyPicker.displayName}
>
<HeaderWithBackButton
Expand Down
1 change: 0 additions & 1 deletion src/components/HeaderPageLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ function HeaderPageLayout({
<ScreenWrapper
style={[StyleUtils.getBackgroundColorStyle(backgroundColor ?? theme.appBG)]}
shouldEnablePickerAvoiding={false}
includeSafeAreaPaddingBottom={false}
offlineIndicatorStyle={[appBGColor]}
testID={testID}
shouldShowOfflineIndicatorInWideScreen={shouldShowOfflineIndicatorInWideScreen}
Expand Down
1 change: 0 additions & 1 deletion src/components/ImportSpreadsheet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ function ImportSpreadsheet({backTo, goTo}: ImportSpreedsheetProps) {

return (
<ScreenWrapper
includeSafeAreaPaddingBottom={false}
shouldEnableKeyboardAvoidingView={false}
testID={ImportSpreadsheet.displayName}
shouldEnableMaxHeight={DeviceCapabilities.canUseTouchScreen()}
Expand Down
1 change: 0 additions & 1 deletion src/components/PushRowWithModal/PushRowModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ function PushRowModal({isVisible, selectedOption, onOptionChange, onClose, optio
>
<ScreenWrapper
includePaddingTop={false}
includeSafeAreaPaddingBottom={false}
testID={PushRowModal.displayName}
>
<HeaderWithBackButton
Expand Down
1 change: 0 additions & 1 deletion src/components/StatePicker/StateSelectorModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ function StateSelectorModal({isVisible, currentState, onStateSelected, onClose,
<ScreenWrapper
style={[styles.pb0]}
includePaddingTop={false}
includeSafeAreaPaddingBottom={false}
testID={StateSelectorModal.displayName}
>
<HeaderWithBackButton
Expand Down
4 changes: 2 additions & 2 deletions src/libs/PolicyUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1133,11 +1133,11 @@ function getCurrentTaxID(policy: OnyxEntry<Policy>, taxID: string): string | und
return Object.keys(policy?.taxRates?.taxes ?? {}).find((taxIDKey) => policy?.taxRates?.taxes?.[taxIDKey].previousTaxCode === taxID || taxIDKey === taxID);
}

function getWorkspaceAccountID(policyID?: string) {
function getWorkspaceAccountID(policyID: string | undefined) {
const policy = getPolicy(policyID);

if (!policy) {
return 0;
return CONST.DEFAULT_NUMBER_ID;
}
return policy.workspaceAccountID ?? CONST.DEFAULT_NUMBER_ID;
}
Expand Down
1 change: 0 additions & 1 deletion src/pages/Debug/Report/DebugReportPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,6 @@ function DebugReportPage({

return (
<ScreenWrapper
includeSafeAreaPaddingBottom={false}
shouldEnableKeyboardAvoidingView={false}
shouldEnableMinHeight={DeviceCapabilities.canUseTouchScreen()}
testID={DebugReportPage.displayName}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ function DebugReportActionCreatePage({

return (
<ScreenWrapper
includeSafeAreaPaddingBottom={false}
shouldEnableKeyboardAvoidingView={false}
shouldEnableMinHeight={DeviceCapabilities.canUseTouchScreen()}
testID={DebugReportActionCreatePage.displayName}
Expand Down
1 change: 0 additions & 1 deletion src/pages/Debug/ReportAction/DebugReportActionPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ function DebugReportActionPage({

return (
<ScreenWrapper
includeSafeAreaPaddingBottom={false}
shouldEnableKeyboardAvoidingView={false}
shouldEnableMinHeight={DeviceCapabilities.canUseTouchScreen()}
testID={DebugReportActionPage.displayName}
Expand Down
1 change: 0 additions & 1 deletion src/pages/Debug/Transaction/DebugTransactionPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ function DebugTransactionPage({

return (
<ScreenWrapper
includeSafeAreaPaddingBottom={false}
shouldEnableKeyboardAvoidingView={false}
shouldEnableMinHeight={DeviceCapabilities.canUseTouchScreen()}
testID={DebugTransactionPage.displayName}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ function DebugTransactionViolationCreatePage({

return (
<ScreenWrapper
includeSafeAreaPaddingBottom={false}
shouldEnableKeyboardAvoidingView={false}
shouldEnableMinHeight={DeviceCapabilities.canUseTouchScreen()}
testID={DebugTransactionViolationCreatePage.displayName}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ function DebugTransactionViolationPage({

return (
<ScreenWrapper
includeSafeAreaPaddingBottom={false}
shouldEnableKeyboardAvoidingView={false}
shouldEnableMinHeight={DeviceCapabilities.canUseTouchScreen()}
testID={DebugTransactionViolationPage.displayName}
Expand Down
1 change: 0 additions & 1 deletion src/pages/EditReportFieldPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ function EditReportFieldPage({route}: EditReportFieldPageProps) {
if (!reportFieldsEnabled || !reportField || !policyField || !report || isDisabled) {
return (
<ScreenWrapper
includeSafeAreaPaddingBottom={false}
shouldEnableMaxHeight
testID={EditReportFieldPage.displayName}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ function AddBankAccount() {
return (
<ScreenWrapper
testID={AddBankAccount.displayName}
includeSafeAreaPaddingBottom={false}
shouldEnablePickerAvoiding={false}
shouldShowOfflineIndicator
>
Expand Down
2 changes: 0 additions & 2 deletions src/pages/EnablePayments/EnablePayments.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ function EnablePaymentsPage() {
return (
<ScreenWrapper
testID={EnablePaymentsPage.displayName}
includeSafeAreaPaddingBottom={false}
shouldEnablePickerAvoiding={false}
>
<DelegateNoAccessWrapper accessDeniedVariants={[CONST.DELEGATE.DENIED_ACCESS_VARIANTS.DELEGATE]} />
Expand All @@ -55,7 +54,6 @@ function EnablePaymentsPage() {
return (
<ScreenWrapper
testID={EnablePaymentsPage.displayName}
includeSafeAreaPaddingBottom={false}
shouldEnablePickerAvoiding={false}
>
<HeaderWithBackButton
Expand Down
5 changes: 1 addition & 4 deletions src/pages/FlagCommentPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,7 @@ function FlagCommentPage({parentReportAction, route, report, parentReport, repor
));

return (
<ScreenWrapper
includeSafeAreaPaddingBottom={false}
testID={FlagCommentPage.displayName}
>
<ScreenWrapper testID={FlagCommentPage.displayName}>
{({safeAreaPaddingBottomStyle}) => (
<FullPageNotFoundView shouldShow={!shouldShowFlagComment(reportAction, report)}>
<HeaderWithBackButton
Expand Down
5 changes: 1 addition & 4 deletions src/pages/KeyboardShortcutsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,7 @@ function KeyboardShortcutsPage() {
);

return (
<ScreenWrapper
includeSafeAreaPaddingBottom={false}
testID={KeyboardShortcutsPage.displayName}
>
<ScreenWrapper testID={KeyboardShortcutsPage.displayName}>
<HeaderWithBackButton title={translate('keyboardShortcutsPage.title')} />
<ScrollView contentContainerStyle={styles.flexGrow1}>
<View style={[styles.ph5, styles.pv3]}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ function MissingPersonalDetailsContent({privatePersonalDetails, draftValues}: Mi

return (
<ScreenWrapper
includeSafeAreaPaddingBottom={false}
shouldEnableMaxHeight
testID={MissingPersonalDetailsContent.displayName}
>
Expand Down
1 change: 0 additions & 1 deletion src/pages/NewChatSelectorPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ function NewChatSelectorPage() {
return (
<ScreenWrapper
shouldEnableKeyboardAvoidingView={false}
includeSafeAreaPaddingBottom={false}
shouldShowOfflineIndicator={false}
shouldEnableMaxHeight
testID={NewChatSelectorPage.displayName}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@ function BaseOnboardingAccounting({shouldUseNativeStyles}: BaseOnboardingAccount

return (
<ScreenWrapper
includeSafeAreaPaddingBottom={false}
testID="BaseOnboardingAccounting"
style={[styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ function BaseOnboardingEmployees({shouldUseNativeStyles, route}: BaseOnboardingE

return (
<ScreenWrapper
includeSafeAreaPaddingBottom={false}
testID="BaseOnboardingEmployees"
style={[styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ function BaseOnboardingPrivateDomain({shouldUseNativeStyles, route}: BaseOnboard

return (
<ScreenWrapper
includeSafeAreaPaddingBottom={false}
testID="BaseOnboardingPrivateDomain"
style={[styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ function BaseOnboardingWorkspaces({shouldUseNativeStyles, route}: BaseOnboarding

return (
<ScreenWrapper
includeSafeAreaPaddingBottom={false}
testID="BaseOnboardingWorkspaces"
style={[styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]}
>
Expand Down
5 changes: 1 addition & 4 deletions src/pages/PrivateNotes/PrivateNotesListPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,7 @@ function PrivateNotesListPage({report, accountID: sessionAccountID}: PrivateNote
}, [report, personalDetailsList, sessionAccountID, translate, backTo]);

return (
<ScreenWrapper
includeSafeAreaPaddingBottom={false}
testID={PrivateNotesListPage.displayName}
>
<ScreenWrapper testID={PrivateNotesListPage.displayName}>
<HeaderWithBackButton
title={translate('privateNotes.title')}
shouldShowBackButton
Expand Down
5 changes: 1 addition & 4 deletions src/pages/ReimbursementAccount/BankAccountStep.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,7 @@ function BankAccountStep({
}

return (
<ScreenWrapper
includeSafeAreaPaddingBottom={false}
testID={BankAccountStep.displayName}
>
<ScreenWrapper testID={BankAccountStep.displayName}>
<View style={[styles.flex1, styles.justifyContentBetween]}>
<HeaderWithBackButton
title={translate('workspace.common.connectBankAccount')}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ function BusinessTypeSelectorModal({isVisible, currentBusinessType, onBusinessTy
<ScreenWrapper
style={[styles.pb0]}
includePaddingTop={false}
includeSafeAreaPaddingBottom={false}
testID={BusinessTypeSelectorModal.displayName}
>
<HeaderWithBackButton
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ function ConnectBankAccount({reimbursementAccount, onBackButtonPress, account, p
return (
<ScreenWrapper
testID={ConnectBankAccount.displayName}
includeSafeAreaPaddingBottom={false}
shouldEnablePickerAvoiding={false}
shouldEnableMaxHeight
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,7 @@ function ContinueBankAccountSetup({policyName = '', onBackButtonPress, reimburse
const pendingAction = reimbursementAccount?.pendingAction ?? null;

return (
<ScreenWrapper
includeSafeAreaPaddingBottom={false}
testID={ContinueBankAccountSetup.displayName}
>
<ScreenWrapper testID={ContinueBankAccountSetup.displayName}>
<HeaderWithBackButton
title={translate('workspace.common.connectBankAccount')}
subtitle={policyName}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ function EnableBankAccount({reimbursementAccount, onBackButtonPress}: EnableBank
return (
<ScreenWrapper
testID={EnableBankAccount.displayName}
includeSafeAreaPaddingBottom={false}
shouldEnablePickerAvoiding={false}
shouldEnableMaxHeight
style={[styles.flex1, styles.justifyContentBetween, styles.mh2]}
Expand Down
1 change: 0 additions & 1 deletion src/pages/ReimbursementAccount/NonUSD/Finish/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ function Finish() {
return (
<ScreenWrapper
testID={Finish.displayName}
includeSafeAreaPaddingBottom={false}
shouldEnablePickerAvoiding={false}
shouldEnableMaxHeight
>
Expand Down
1 change: 0 additions & 1 deletion src/pages/ReportParticipantsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,6 @@ function ReportParticipantsPage({report, route}: ReportParticipantsPageProps) {

return (
<ScreenWrapper
includeSafeAreaPaddingBottom={false}
style={[styles.defaultModalContainer]}
testID={ReportParticipantsPage.displayName}
>
Expand Down
1 change: 0 additions & 1 deletion src/pages/RoomMembersPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,6 @@ function RoomMembersPage({report, policies}: RoomMembersPageProps) {

return (
<ScreenWrapper
includeSafeAreaPaddingBottom={false}
style={[styles.defaultModalContainer]}
testID={RoomMembersPage.displayName}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ function SearchFiltersExpenseTypePage() {
testID={SearchFiltersExpenseTypePage.displayName}
shouldShowOfflineIndicatorInWideScreen
offlineIndicatorStyle={styles.mtAuto}
includeSafeAreaPaddingBottom={false}
shouldEnableMaxHeight
>
<HeaderWithBackButton
Expand Down
1 change: 0 additions & 1 deletion src/pages/TeachersUnite/SaveTheWorldPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ function SaveTheWorldPage() {
return (
<ScreenWrapper
testID={SaveTheWorldPage.displayName}
includeSafeAreaPaddingBottom={false}
shouldEnablePickerAvoiding={false}
shouldShowOfflineIndicatorInWideScreen
>
Expand Down
1 change: 0 additions & 1 deletion src/pages/Travel/MyTripsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ function MyTripsPage() {

return (
<ScreenWrapper
includeSafeAreaPaddingBottom={false}
shouldEnablePickerAvoiding={false}
shouldEnableMaxHeight
testID={MyTripsPage.displayName}
Expand Down
1 change: 0 additions & 1 deletion src/pages/Travel/TravelUpgrade.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ function TravelUpgrade() {
<ScreenWrapper
style={[styles.pb0]}
includePaddingTop={false}
includeSafeAreaPaddingBottom={false}
testID={TravelUpgrade.displayName}
>
<WorkspaceConfirmationForm
Expand Down
1 change: 0 additions & 1 deletion src/pages/Travel/TripSummaryPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ function TripSummaryPage({route}: TripSummaryPageProps) {

return (
<ScreenWrapper
includeSafeAreaPaddingBottom={false}
shouldEnablePickerAvoiding={false}
shouldEnableMaxHeight
testID={TripSummaryPage.displayName}
Expand Down
1 change: 0 additions & 1 deletion src/pages/home/sidebar/AllSettingsScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ function AllSettingsScreen() {
<ScreenWrapper
testID={AllSettingsScreen.displayName}
includePaddingTop={false}
includeSafeAreaPaddingBottom={false}
style={[styles.pb0]}
>
<Breadcrumbs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ function StepScreenDragAndDropWrapper({testID, headerTitle, onBackButtonPress, o

return (
<ScreenWrapper
includeSafeAreaPaddingBottom={false}
shouldEnableKeyboardAvoidingView={false}
onEntryTransitionEnd={onEntryTransitionEnd}
testID={testID}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,7 @@ function BaseShareLogList({onAttachLogToReport}: BaseShareLogListProps) {
}, [debouncedSearchValue]);

return (
<ScreenWrapper
testID={BaseShareLogList.displayName}
includeSafeAreaPaddingBottom={false}
>
<ScreenWrapper testID={BaseShareLogList.displayName}>
{({didScreenTransitionEnd}) => (
<>
<HeaderWithBackButton
Expand Down
1 change: 0 additions & 1 deletion src/pages/settings/InitialSettingsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,6 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr

return (
<ScreenWrapper
includeSafeAreaPaddingBottom
testID={InitialSettingsPage.displayName}
bottomContent={<BottomTabBar selectedTab={BOTTOM_TABS.SETTINGS} />}
shouldEnableKeyboardAvoidingView={false}
Expand Down
Loading