-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #10747 from Expensify/update-staging-from-main
Update version to 1.1.96-0 on staging
- Loading branch information
Showing
32 changed files
with
481 additions
and
482 deletions.
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
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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,68 @@ | ||
| import React from 'react'; | ||
| import _ from 'underscore'; | ||
| import PropTypes from 'prop-types'; | ||
| import {View} from 'react-native'; | ||
| import styles from '../styles/styles'; | ||
| import Icon from './Icon'; | ||
| import * as Expensicons from './Icon/Expensicons'; | ||
| import colors from '../styles/colors'; | ||
| import variables from '../styles/variables'; | ||
| import Text from './Text'; | ||
|
|
||
| const propTypes = { | ||
| /** | ||
| * In most cases this should just be errors from onxyData | ||
| * if you are not passing that data then this needs to be in a similar shape like | ||
| * { | ||
| * timestamp: 'message', | ||
| * } | ||
| */ | ||
| messages: PropTypes.objectOf(PropTypes.string), | ||
|
|
||
| // The type of message, 'error' shows a red dot, 'success' shows a green dot | ||
| type: PropTypes.oneOf(['error', 'success']).isRequired, | ||
|
|
||
| // Additional styles to apply to the container */ | ||
| // eslint-disable-next-line react/forbid-prop-types | ||
| style: PropTypes.arrayOf(PropTypes.object), | ||
| }; | ||
|
|
||
| const defaultProps = { | ||
| messages: {}, | ||
| style: [], | ||
| }; | ||
|
|
||
| const DotIndicatorMessage = (props) => { | ||
| if (_.isEmpty(props.messages)) { | ||
| return null; | ||
| } | ||
|
|
||
| // To ensure messages are presented in order we are sort of destroying the data we are given | ||
| // and rebuilding as an array so we can render the messages in order. We don't really care about | ||
| // the microtime timestamps anyways so isn't the end of the world that we sort of lose them here. | ||
| // BEWARE: if you decide to refactor this and keep the microtime keys it could cause performance issues | ||
| const sortedMessages = _.chain(props.messages) | ||
| .keys() | ||
| .sortBy() | ||
| .map(key => props.messages[key]) | ||
| .value(); | ||
|
|
||
| return ( | ||
| <View style={[styles.dotIndicatorMessage, ...props.style]}> | ||
| <View style={styles.offlineFeedback.errorDot}> | ||
| <Icon src={Expensicons.DotIndicator} fill={props.type === 'error' ? colors.red : colors.green} height={variables.iconSizeSmall} width={variables.iconSizeSmall} /> | ||
| </View> | ||
| <View style={styles.offlineFeedback.textContainer}> | ||
| {_.map(sortedMessages, (message, i) => ( | ||
| <Text key={i} style={styles.offlineFeedback.text}>{message}</Text> | ||
| ))} | ||
| </View> | ||
| </View> | ||
| ); | ||
| }; | ||
|
|
||
| DotIndicatorMessage.propTypes = propTypes; | ||
| DotIndicatorMessage.defaultProps = defaultProps; | ||
|
|
||
| export default DotIndicatorMessage; | ||
|
|
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
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
Oops, something went wrong.