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

Jump to bottom

[Wave Collect] [Xero] Fix padding issue in ConnectionLayout #41561

Merged
merged 8 commits into from
May 6, 2024
Merged

[Wave Collect] [Xero] Fix padding issue in ConnectionLayout #41561

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
38bf542
Fix padding issue in ConnectionLayout
hungvu193 May 3, 2024
0a411e1
fix linting
hungvu193 May 3, 2024
c262734
fix title and subtitle style
hungvu193 May 3, 2024
3179457
add spacing for explaning props
hungvu193 May 3, 2024
32e9d26
fix linting
hungvu193 May 3, 2024
3725970
merge main
hungvu193 May 5, 2024
d3871c9
update the company title style
hungvu193 May 5, 2024
b2804f4
address prettier
hungvu193 May 5, 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
32 changes: 23 additions & 9 deletions src/components/ConnectionLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import {View} from 'react-native';
import type {StyleProp, TextStyle, ViewStyle} from 'react-native';
import useLocalize from '@hooks/useLocalize';
import useThemeStyles from '@hooks/useThemeStyles';
import Navigation from '@libs/Navigation/Navigation';
Expand Down Expand Up @@ -29,9 +29,27 @@ type ConnectionLayoutProps = {
accessVariants?: PolicyAccessVariant[];
/** The current feature name that the user tries to get access to */
featureName?: PolicyFeatureName;
/** The content container style of Scrollview */
contentContainerStyle?: StyleProp<ViewStyle> | undefined;
/** Style of the title text */
titleStyle?: StyleProp<TextStyle> | undefined;
/** Style of the subtitle text */
hungvu193 marked this conversation as resolved.
Show resolved Hide resolved
subTitleStyle?: StyleProp<TextStyle> | undefined;
};

function ConnectionLayout({displayName, headerTitle, children, title, subtitle, policyID, accessVariants, featureName}: ConnectionLayoutProps) {
function ConnectionLayout({
displayName,
headerTitle,
children,
title,
subtitle,
policyID,
accessVariants,
featureName,
contentContainerStyle,
titleStyle,
subTitleStyle,
}: ConnectionLayoutProps) {
const styles = useThemeStyles();
const {translate} = useLocalize();

Expand All @@ -50,13 +68,9 @@ function ConnectionLayout({displayName, headerTitle, children, title, subtitle,
title={translate(headerTitle)}
onBackButtonPress={() => Navigation.goBack()}
/>
<ScrollView contentContainerStyle={[styles.pb2, styles.ph5]}>
{title && (
<View style={[styles.pb2]}>
<Text style={styles.pb5}>{translate(title)}</Text>
</View>
)}
{subtitle && <Text style={styles.textLabelSupporting}>{translate(subtitle)}</Text>}
<ScrollView contentContainerStyle={contentContainerStyle}>
{title && <Text style={[styles.pb5, titleStyle]}>{translate(title)}</Text>}
{subtitle && <Text style={[styles.textLabelSupporting, subTitleStyle]}>{translate(subtitle)}</Text>}
{children}
</ScrollView>
</ScreenWrapper>
Expand Down
1 change: 1 addition & 0 deletions src/pages/workspace/accounting/xero/advanced/XeroAdvancedPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ function XeroAdvancedPage({policy}: WithPolicyConnectionsProps) {
accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
policyID={policyID}
featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
contentContainerStyle={[styles.pb2, styles.ph5]}
>
<ToggleSettingOptionRow
key={translate('workspace.xero.advancedConfig.autoSync')}
Expand Down
1 change: 1 addition & 0 deletions src/pages/workspace/accounting/xero/import/XeroCustomerConfigurationPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ function XeroCustomerConfigurationPage({policy}: WithPolicyProps) {
accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
policyID={policyID}
featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
contentContainerStyle={[[styles.pb2, styles.ph5]]}
>
<View>
<View style={[styles.flexRow, styles.mb4, styles.alignItemsCenter, styles.justifyContentBetween]}>
Expand Down
Loading