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

[TS migration] Migrate 'CardPreview.js' component to TypeScript #32570

Merged
merged 3 commits into from
Dec 11, 2023
Merged

[TS migration] Migrate 'CardPreview.js' component to TypeScript #32570

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20df6e7
refactor(typescript): migrate cardpreview
pac-guerreiro Dec 6, 2023
839e381
refactor(typescript): apply pull request feedback
pac-guerreiro Dec 7, 2023
23e6da4
Merge branch 'main' into pac-guerreiro/refactor/migrate-cardpreview-t…
pac-guerreiro Dec 8, 2023
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
35 changes: 10 additions & 25 deletions src/components/CardPreview.js → src/components/CardPreview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,28 @@
import PropTypes from 'prop-types';
import React from 'react';
import {View} from 'react-native';
import {withOnyx} from 'react-native-onyx';
import {OnyxEntry, withOnyx} from 'react-native-onyx';
import ExpensifyCardImage from '@assets/images/expensify-card.svg';
import usePrivatePersonalDetails from '@hooks/usePrivatePersonalDetails';
import useThemeStyles from '@styles/useThemeStyles';
import variables from '@styles/variables';
import ONYXKEYS from '@src/ONYXKEYS';
import {PrivatePersonalDetails, Session} from '@src/types/onyx';
import Text from './Text';

const propTypes = {
type CardPreviewOnyxProps = {
/** User's private personal details */
privatePersonalDetails: PropTypes.shape({
legalFirstName: PropTypes.string,
legalLastName: PropTypes.string,
}),
privatePersonalDetails: OnyxEntry<PrivatePersonalDetails>;
/** Session info for the currently logged in user. */
session: PropTypes.shape({
/** Currently logged-in user email */
email: PropTypes.string,
}),
session: OnyxEntry<Session>;
};

const defaultProps = {
privatePersonalDetails: {
legalFirstName: '',
legalLastName: '',
},
session: {
email: '',
},
};
type CardPreviewProps = CardPreviewOnyxProps;

function CardPreview({privatePersonalDetails: {legalFirstName, legalLastName}, session: {email}}) {
function CardPreview({privatePersonalDetails, session}: CardPreviewProps) {
const styles = useThemeStyles();
usePrivatePersonalDetails();
const cardHolder = legalFirstName && legalLastName ? `${legalFirstName} ${legalLastName}` : email;
const {legalFirstName, legalLastName} = privatePersonalDetails ?? {};
const cardHolder = legalFirstName && legalLastName ? `${legalFirstName} ${legalLastName}` : session?.email ?? '';

return (
<View style={styles.walletCard}>
Expand All @@ -55,11 +42,9 @@ function CardPreview({privatePersonalDetails: {legalFirstName, legalLastName}, s
);
}

CardPreview.propTypes = propTypes;
CardPreview.defaultProps = defaultProps;
CardPreview.displayName = 'CardPreview';

export default withOnyx({
export default withOnyx<CardPreviewProps, CardPreviewOnyxProps>({
privatePersonalDetails: {
key: ONYXKEYS.PRIVATE_PERSONAL_DETAILS,
},
Expand Down
Loading