-
Notifications
You must be signed in to change notification settings - Fork 3k
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.
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
Fix issue with google meet not opening on Android #9193
Merged
AndrewGable
merged 2 commits into
Expensify:main
from
eVoloshchak:eVoloshchak_googleMeet
Jun 2, 2022
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
import React from 'react'; | ||
import CONST from '../../CONST'; | ||
import {propTypes, defaultProps} from './videoChatButtonAndMenuPropTypes'; | ||
import BaseVideoChatButtonAndMenu from './BaseVideoChatButtonAndMenu'; | ||
|
||
// On Android creating a new google meet meeting requires the CALL_PHONE permission in some cases | ||
// so we're just opening the google meet app instead, more details: | ||
// https://github.com/Expensify/App/issues/8851#issuecomment-1120236904 | ||
const VideoChatButtonAndMenu = props => ( | ||
<BaseVideoChatButtonAndMenu | ||
newGoogleMeetingUrl={CONST.GOOGLE_MEET_URL_ANDROID} | ||
// eslint-disable-next-line react/jsx-props-no-spreading | ||
{...props} | ||
/> | ||
); | ||
|
||
VideoChatButtonAndMenu.propTypes = propTypes; | ||
VideoChatButtonAndMenu.defaultProps = defaultProps; | ||
VideoChatButtonAndMenu.displayName = 'VideoChatButtonAndMenu'; | ||
export default VideoChatButtonAndMenu; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
import React from 'react'; | ||
import {propTypes, defaultProps} from './videoChatButtonAndMenuPropTypes'; | ||
import BaseVideoChatButtonAndMenu from './BaseVideoChatButtonAndMenu'; | ||
|
||
const VideoChatButtonAndMenu = props => ( | ||
<BaseVideoChatButtonAndMenu | ||
// eslint-disable-next-line react/jsx-props-no-spreading | ||
{...props} | ||
/> | ||
); | ||
|
||
VideoChatButtonAndMenu.propTypes = propTypes; | ||
VideoChatButtonAndMenu.defaultProps = defaultProps; | ||
VideoChatButtonAndMenu.displayName = 'VideoChatButtonAndMenu'; | ||
export default VideoChatButtonAndMenu; |
20 changes: 20 additions & 0 deletions
20
src/components/VideoChatButtonAndMenu/videoChatButtonAndMenuPropTypes.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
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 */ | ||
newGoogleMeetingUrl: PropTypes.string, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Rename |
||
|
||
...withLocalizePropTypes, | ||
...windowDimensionsPropTypes, | ||
}; | ||
|
||
const defaultProps = { | ||
isConcierge: false, | ||
}; | ||
|
||
export {propTypes, defaultProps}; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Umm, let's pass
CONST.NEW_GOOGLE_MEET_MEETING_URL
from index.jsI think it improves code readability.