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 'SettingsAbout' page to TypeScript #34597

Merged
merged 5 commits into from
Jan 29, 2024
Merged

[TS migration] Migrate 'SettingsAbout' page to TypeScript #34597

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f8e2d22
refactor(typescript): migrate aboutpage
pac-guerreiro Jan 16, 2024
fb68ea9
refactor(typescript): apply pull request feedback
pac-guerreiro Jan 17, 2024
c37644b
Merge branch 'main' into pac-guerreiro/refactor/migrate-settingsabout…
pac-guerreiro Jan 17, 2024
c6af6fa
Merge branch 'main' into pac-guerreiro/refactor/migrate-settingsabout…
pac-guerreiro Jan 18, 2024
5a5fbf3
Merge branch 'main' into pac-guerreiro/refactor/migrate-settingsabout…
pac-guerreiro Jan 26, 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
70 changes: 39 additions & 31 deletions src/pages/settings/AboutPage/AboutPage.js → src/pages/settings/AboutPage/AboutPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,31 @@
import React, {useCallback, useMemo, useRef} from 'react';
import {View} from 'react-native';
// eslint-disable-next-line no-restricted-imports
import type {GestureResponderEvent, Text as RNText} from 'react-native';
import DeviceInfo from 'react-native-device-info';
import _ from 'underscore';
import * as Expensicons from '@components/Icon/Expensicons';
import IllustratedHeaderPageLayout from '@components/IllustratedHeaderPageLayout';
import LottieAnimations from '@components/LottieAnimations';
import MenuItemList from '@components/MenuItemList';
import Text from '@components/Text';
import TextLink from '@components/TextLink';
import withLocalize, {withLocalizePropTypes} from '@components/withLocalize';
import withWindowDimensions, {windowDimensionsPropTypes} from '@components/withWindowDimensions';
import useLocalize from '@hooks/useLocalize';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import useWaitForNavigation from '@hooks/useWaitForNavigation';
import compose from '@libs/compose';
import * as Environment from '@libs/Environment/Environment';
import Navigation from '@libs/Navigation/Navigation';
import * as ReportActionContextMenu from '@pages/home/report/ContextMenu/ReportActionContextMenu';
import * as Link from '@userActions/Link';
import * as Report from '@userActions/Report';
import CONST from '@src/CONST';
import type {TranslationPaths} from '@src/languages/types';
import ROUTES from '@src/ROUTES';
import SCREENS from '@src/SCREENS';
import type IconAsset from '@src/types/utils/IconAsset';
import pkg from '../../../../package.json';

const propTypes = {
...withLocalizePropTypes,
...windowDimensionsPropTypes,
};

function getFlavor() {
function getFlavor(): string {
const bundleId = DeviceInfo.getBundleId();
if (bundleId.includes('dev')) {
return ' Develop';
Expand All @@ -40,15 +36,23 @@ function getFlavor() {
return '';
}

function AboutPage(props) {
type MenuItem = {
translationKey: TranslationPaths;
icon: IconAsset;
iconRight?: IconAsset;
action: () => Promise<void>;
link?: string;
};

function AboutPage() {
const {translate} = useLocalize();
const theme = useTheme();
const styles = useThemeStyles();
const {translate} = props;
const popoverAnchor = useRef(null);
const popoverAnchor = useRef<View | RNText | null>(null);
const waitForNavigate = useWaitForNavigation();

const menuItems = useMemo(() => {
const baseMenuItems = [
const baseMenuItems: MenuItem[] = [
{
translationKey: 'initialSettingsPage.aboutPage.appDownloadLinks',
icon: Expensicons.Link,
Expand All @@ -65,6 +69,7 @@ function AboutPage(props) {
iconRight: Expensicons.NewWindow,
action: () => {
Link.openExternalLink(CONST.GITHUB_URL);
return Promise.resolve();
},
link: CONST.GITHUB_URL,
},
Expand All @@ -74,6 +79,7 @@ function AboutPage(props) {
iconRight: Expensicons.NewWindow,
action: () => {
Link.openExternalLink(CONST.UPWORK_URL);
return Promise.resolve();
},
link: CONST.UPWORK_URL,
},
Expand All @@ -83,16 +89,19 @@ function AboutPage(props) {
action: waitForNavigate(Report.navigateToConciergeChat),
},
];
return _.map(baseMenuItems, (item) => ({
key: item.translationKey,
title: translate(item.translationKey),
icon: item.icon,
iconRight: item.iconRight,
onPress: item.action,

return baseMenuItems.map(({translationKey, icon, iconRight, action, link}: MenuItem) => ({
pac-guerreiro marked this conversation as resolved.
Show resolved Hide resolved
key: translationKey,
title: translate(translationKey),
icon,
iconRight,
onPress: action,
shouldShowRightIcon: true,
onSecondaryInteraction: !_.isEmpty(item.link) ? (e) => ReportActionContextMenu.showContextMenu(CONST.CONTEXT_MENU_TYPES.LINK, e, item.link, popoverAnchor) : undefined,
onSecondaryInteraction: link
? (event: GestureResponderEvent | MouseEvent) => ReportActionContextMenu.showContextMenu(CONST.CONTEXT_MENU_TYPES.LINK, event, link, popoverAnchor.current)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

popoverAnchor - Good catch! Though this was not noticeable as pageX, pageY always exist here:

App/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx

Lines 177 to 182 in c5ca9a8

if (!pageX && !pageY && contextMenuAnchorRef.current) {
calculateAnchorPosition(contextMenuAnchorRef.current).then((position) => {
popoverAnchorPosition.current = position;
resolve();
});
} else {

: undefined,
ref: popoverAnchor,
shouldBlockSelection: Boolean(item.link),
shouldBlockSelection: !!link,
}));
}, [translate, waitForNavigate]);

Expand All @@ -114,15 +123,15 @@ function AboutPage(props) {

return (
<IllustratedHeaderPageLayout
title={props.translate('initialSettingsPage.about')}
title={translate('initialSettingsPage.about')}
onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS)}
illustration={LottieAnimations.Coin}
backgroundColor={theme.PAGE_THEMES[SCREENS.SETTINGS.ABOUT].backgroundColor}
overlayContent={overlayContent}
>
<View style={[styles.settingsPageBody, styles.ph5]}>
<Text style={[styles.textHeadline, styles.mb1]}>{props.translate('footer.aboutExpensify')}</Text>
<Text style={[styles.baseFontStyle, styles.mb4]}>{props.translate('initialSettingsPage.aboutPage.description')}</Text>
<Text style={[styles.textHeadline, styles.mb1]}>{translate('footer.aboutExpensify')}</Text>
<Text style={styles.mb4}>{translate('initialSettingsPage.aboutPage.description')}</Text>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is baseFontStyle not needed now?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@filip-solecki it doesn't exist in styles 😅

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it! LGTM!

</View>
<MenuItemList
menuItems={menuItems}
Expand All @@ -133,19 +142,19 @@ function AboutPage(props) {
style={[styles.chatItemMessageHeaderTimestamp]}
numberOfLines={1}
>
{props.translate('initialSettingsPage.readTheTermsAndPrivacy.phrase1')}{' '}
{translate('initialSettingsPage.readTheTermsAndPrivacy.phrase1')}{' '}
<TextLink
style={[styles.textMicroSupporting, styles.link]}
href={CONST.TERMS_URL}
>
{props.translate('initialSettingsPage.readTheTermsAndPrivacy.phrase2')}
{translate('initialSettingsPage.readTheTermsAndPrivacy.phrase2')}
</TextLink>{' '}
{props.translate('initialSettingsPage.readTheTermsAndPrivacy.phrase3')}{' '}
{translate('initialSettingsPage.readTheTermsAndPrivacy.phrase3')}{' '}
<TextLink
style={[styles.textMicroSupporting, styles.link]}
href={CONST.PRIVACY_URL}
>
{props.translate('initialSettingsPage.readTheTermsAndPrivacy.phrase4')}
{translate('initialSettingsPage.readTheTermsAndPrivacy.phrase4')}
</TextLink>
.
</Text>
Expand All @@ -154,7 +163,6 @@ function AboutPage(props) {
);
}

AboutPage.propTypes = propTypes;
AboutPage.displayName = 'AboutPage';

export default compose(withLocalize, withWindowDimensions)(AboutPage);
export default AboutPage;
Loading