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

[Migration]: migrate GetAssistancePage to typescript #34553

Merged
merged 6 commits into from
Jan 16, 2024
Merged

[Migration]: migrate GetAssistancePage to typescript #34553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
15ed1ba
migrate GetAssistancePage to typescript
DylanDylann Jan 16, 2024
631f4d7
migrate GetAssistancePage to typescript
DylanDylann Jan 16, 2024
b82559d
run prettier
DylanDylann Jan 16, 2024
5813840
fix lint
DylanDylann Jan 16, 2024
95f787c
fix lint
DylanDylann Jan 16, 2024
a91e9fb
fix lint
DylanDylann Jan 16, 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
4 changes: 2 additions & 2 deletions src/components/MenuItemList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ type MenuItemLink = string | (() => Promise<string>);

type MenuItemWithLink = MenuItemProps & {
/** The link to open when the menu item is clicked */
link: MenuItemLink;
link?: MenuItemLink;
};

type MenuItemListProps = {
Expand All @@ -31,7 +31,7 @@ function MenuItemList({menuItems = [], shouldUseSingleExecution = false}: MenuIt
* @param link the menu item link or function to get the link
* @param event the interaction event
*/
const secondaryInteraction = (link: MenuItemLink, event: GestureResponderEvent | MouseEvent) => {
const secondaryInteraction = (link: MenuItemLink | undefined, event: GestureResponderEvent | MouseEvent) => {
if (typeof link === 'function') {
link().then((url) => ReportActionContextMenu.showContextMenu(CONST.CONTEXT_MENU_TYPES.LINK, event, url, popoverAnchor.current));
} else if (link) {
Expand Down
72 changes: 28 additions & 44 deletions src/pages/GetAssistancePage.js → src/pages/GetAssistancePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,61 +1,50 @@
import lodashGet from 'lodash/get';
import PropTypes from 'prop-types';
import type {RouteProp} from '@react-navigation/native';
import React from 'react';
import {ScrollView, View} from 'react-native';
import {withOnyx} from 'react-native-onyx';
import type {OnyxEntry} from 'react-native-onyx/lib/types';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import * as Expensicons from '@components/Icon/Expensicons';
import * as Illustrations from '@components/Icon/Illustrations';
import type {MenuItemWithLink} from '@components/MenuItemList';
import ScreenWrapper from '@components/ScreenWrapper';
import Section from '@components/Section';
import Text from '@components/Text';
import withLocalize, {withLocalizePropTypes} from '@components/withLocalize';
import useLocalize from '@hooks/useLocalize';
import useThemeStyles from '@hooks/useThemeStyles';
import compose from '@libs/compose';
import Navigation from '@libs/Navigation/Navigation';
import * as Link from '@userActions/Link';
import * as Report from '@userActions/Report';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import type {Route} from '@src/ROUTES';
import type {Account} from '@src/types/onyx';

const propTypes = {
/** Route object from navigation */
route: PropTypes.shape({
params: PropTypes.shape({
/** The task ID to request the call for */
taskID: PropTypes.string,
}),
}).isRequired,

type GetAssistanceOnyxProps = {
/** The details about the account that the user is signing in with */
account: PropTypes.shape({
/** URL to the assigned guide's appointment booking calendar */
guideCalendarLink: PropTypes.string,
}),

...withLocalizePropTypes,
account: OnyxEntry<Account>;
};

const defaultProps = {
account: {
guideCalendarLink: null,
},
type GetAssistancePageProps = GetAssistanceOnyxProps & {
/** Route object from navigation */
route: RouteProp<{params: {backTo: Route}}>;
};

Comment on lines +29 to 32
Copy link
Contributor

Choose a reason for hiding this comment

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

@pecanoro Unfortunately I missed this PR before the merge, this is not a big deal but this part should look a bit different:

type GetAssistancePageProps = GetAssistanceOnyxProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.GET_ASSISTANCE>;

And improved type:

// src/navigation/types.ts
[SCREENS.GET_ASSISTANCE]: {
    backTo: Route;
};

Copy link
Contributor

Choose a reason for hiding this comment

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

@blazejkustra

Noted, I'll catch similar cases in the future. Do you have some other concerns about this PR?

@DylanDylann

Would you file a follow-up PR with this typing improvement?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I will create a quick PR to update

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@cubuspl42 The PR is created here, tested on web

function GetAssistancePage(props) {
function GetAssistancePage({route, account}: GetAssistancePageProps) {
const styles = useThemeStyles();
const navigateBackTo = lodashGet(props.route, 'params.backTo', ROUTES.SETTINGS_CONTACT_METHODS);
const menuItems = [
const {translate} = useLocalize();
const navigateBackTo = route?.params.backTo || ROUTES.SETTINGS_CONTACT_METHODS.getRoute();
const menuItems: MenuItemWithLink[] = [
{
title: props.translate('getAssistancePage.chatWithConcierge'),
title: translate('getAssistancePage.chatWithConcierge'),
onPress: () => Report.navigateToConciergeChat(),
icon: Expensicons.ChatBubble,
shouldShowRightIcon: true,
wrapperStyle: [styles.cardMenuItem],
},
{
title: props.translate('getAssistancePage.exploreHelpDocs'),
title: translate('getAssistancePage.exploreHelpDocs'),
onPress: () => Link.openExternalLink(CONST.NEWHELP_URL),
icon: Expensicons.QuestionMark,
shouldShowRightIcon: true,
Expand All @@ -66,10 +55,10 @@ function GetAssistancePage(props) {
];

// If the user is eligible for calls with their Guide, add the 'Schedule a setup call' item at the second position in the list
const guideCalendarLink = lodashGet(props.account, 'guideCalendarLink');
const guideCalendarLink = account?.guideCalendarLink;
if (guideCalendarLink) {
menuItems.splice(1, 0, {
title: props.translate('getAssistancePage.scheduleSetupCall'),
title: translate('getAssistancePage.scheduleSetupCall'),
onPress: () => Link.openExternalLink(guideCalendarLink),
icon: Expensicons.Phone,
shouldShowRightIcon: true,
Expand All @@ -82,34 +71,29 @@ function GetAssistancePage(props) {
return (
<ScreenWrapper testID={GetAssistancePage.displayName}>
<HeaderWithBackButton
title={props.translate('getAssistancePage.title')}
title={translate('getAssistancePage.title')}
onBackButtonPress={() => Navigation.goBack(navigateBackTo)}
/>
<ScrollView>
<Section
title={props.translate('getAssistancePage.subtitle')}
title={translate('getAssistancePage.subtitle')}
icon={Illustrations.ConciergeNew}
menuItems={menuItems}
>
<View style={styles.mv3}>
<Text>{props.translate('getAssistancePage.description')}</Text>
<Text>{translate('getAssistancePage.description')}</Text>
</View>
</Section>
</ScrollView>
</ScreenWrapper>
);
}

GetAssistancePage.propTypes = propTypes;
GetAssistancePage.defaultProps = defaultProps;
GetAssistancePage.displayName = 'GetAssistancePage';

export default compose(
withLocalize,
withOnyx({
account: {
key: ONYXKEYS.ACCOUNT,
selector: (account) => account && {guideCalendarLink: account.guideCalendarLink},
},
}),
)(GetAssistancePage);
export default withOnyx<GetAssistancePageProps, GetAssistanceOnyxProps>({
account: {
key: ONYXKEYS.ACCOUNT,
selector: (account) => account && {guideCalendarLink: account.guideCalendarLink},
},
})(GetAssistancePage);
Loading