Skip to content

Fix console error caused by incorrect propTypes #9315

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

Merged
merged 1 commit into from
Jun 5, 2022
Merged

Fix console error caused by incorrect propTypes #9315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 13 additions & 3 deletions src/components/VideoChatButtonAndMenu/BaseVideoChatButtonAndMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import React, {Component} from 'react';
import {
View, Pressable, Dimensions, Linking,
} from 'react-native';
import PropTypes from 'prop-types';
import Icon from '../Icon';
import * as Expensicons from '../Icon/Expensicons';
import Popover from '../Popover';
Expand All @@ -12,13 +13,22 @@ import GoogleMeetIcon from '../../../assets/images/google-meet.svg';
import CONST from '../../CONST';
import styles from '../../styles/styles';
import themeColors from '../../styles/themes/default';
import withWindowDimensions from '../withWindowDimensions';
import withLocalize from '../withLocalize';
import withWindowDimensions, {windowDimensionsPropTypes} from '../withWindowDimensions';
import withLocalize, {withLocalizePropTypes} from '../withLocalize';
import compose from '../../libs/compose';
import Navigation from '../../libs/Navigation/Navigation';
import ROUTES from '../../ROUTES';
import Tooltip from '../Tooltip';
import {propTypes, defaultProps} from './videoChatButtonAndMenuPropTypes';
import {propTypes as videoChatButtonAndMenuPropTypes, defaultProps} from './videoChatButtonAndMenuPropTypes';

const propTypes = {
/** Link to open when user wants to create a new google meet meeting */
googleMeetURL: PropTypes.string.isRequired,

...videoChatButtonAndMenuPropTypes,
...withLocalizePropTypes,
...windowDimensionsPropTypes,
};

class BaseVideoChatButtonAndMenu extends Component {
constructor(props) {
Expand Down
8 changes: 0 additions & 8 deletions src/components/VideoChatButtonAndMenu/videoChatButtonAndMenuPropTypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
import PropTypes from 'prop-types';
import {windowDimensionsPropTypes} from '../withWindowDimensions';
import {withLocalizePropTypes} from '../withLocalize';

const propTypes = {
/** If this is the Concierge chat, we'll open the modal for requesting a setup call instead of showing popover menu */
isConcierge: PropTypes.bool,

/** Link to open when user wants to create a new google meet meeting */
googleMeetURL: PropTypes.string.isRequired,

...withLocalizePropTypes,
...windowDimensionsPropTypes,
};

const defaultProps = {
Expand Down