diff --git a/STORYBOOK.md b/STORYBOOK.md
index cb4cf290a77a..3139b5493a3c 100644
--- a/STORYBOOK.md
+++ b/STORYBOOK.md
@@ -36,16 +36,16 @@ Here's an example story:
```javascript
import React from 'react';
-import Button from '../components/Button';
+import ExpensifyButton from '../components/ExpensifyButton';
const story = {
// Title field will determine how the story displays in the sidebar
- title: 'Components/Button',
- component: Button,
+ title: 'Components/ExpensifyButton',
+ component: ExpensifyButton,
};
// Optional `args` are passed which determine the props the example component will have
-const Template = args => ;
+const Template = args => ;
// Each story must be exported with a named export
const Default = Template.bind({});
diff --git a/STYLE.md b/STYLE.md
index 7a9fe40deed9..fab2ee1304d2 100644
--- a/STYLE.md
+++ b/STYLE.md
@@ -277,16 +277,16 @@ render() {
// Bad
const UserInfo = ({name, email}) => (
- Name: {name}
- Email: {email}
+ Name: {name}
+ Email: {email}
);
// Good
const UserInfo = props => (
- Name: {props.name}
- Email: {props.email}
+ Name: {props.name}
+ Email: {props.email}
);
```
@@ -701,9 +701,9 @@ class BComposedComponent extends React.Component
render() {
return (
-
+
{this.state.whatever}
-
+
)
}
diff --git a/STYLING.md b/STYLING.md
index ea402f162373..dcc484d3ce5a 100644
--- a/STYLING.md
+++ b/STYLING.md
@@ -15,21 +15,21 @@ If we need some minimal set of styling rules applied to a single-use component t
```jsx
// Bad - Since we only use this style once in this component
const TextWithPadding = props => (
-
+
{props.children}
-
+
);
// Good
const TextWithPadding = props => (
-
{props.children}
-
+
);
```
@@ -46,7 +46,7 @@ Any array of styles associated with a single type of React element that has at l
- If a reusable style has 3 or more modifiers it should be refactored into a component with props to modify the styles e.g.
```jsx
-
+
```
## Inline Styles
@@ -56,24 +56,24 @@ Any array of styles associated with a single type of React element that has at l
```jsx
// Bad - Do not use inline styles
const TextWithPadding = props => (
-
{props.children}
-
+
);
// Good
const TextWithPadding = props => (
-
{props.children}
-
+
);
```
@@ -85,34 +85,34 @@ There are many styles in the `styles.js` file. It is generally a bad practice to
// Bad - Reuses style without generalizing style name
const SettingsScreen = props => (
-
+
Expensify
-
+
);
const SomeOtherScreen = props => (
-
+
New Expensify
-
+
);
// Good
const SettingsScreen = props => (
-
+
Expensify
-
+
);
const SomeOtherScreen = props => (
-
+
New Expensify
-
+
);
```
@@ -193,7 +193,7 @@ The only time we should allow a component to have a `style` prop with `PropTypes
```jsx
// Good
const CustomText = props => (
- {props.children}
+ {props.children}
);
// Good
@@ -202,14 +202,14 @@ const CustomText = props => {
? props.style
: [props.style];
}(
-
{props.children}
-
+
);
```
diff --git a/src/components/AddPlaidBankAccount.js b/src/components/AddPlaidBankAccount.js
index d19c8c4fe2fd..b4b1fe23ff11 100644
--- a/src/components/AddPlaidBankAccount.js
+++ b/src/components/AddPlaidBankAccount.js
@@ -16,7 +16,7 @@ import themeColors from '../styles/themes/default';
import compose from '../libs/compose';
import withLocalize, {withLocalizePropTypes} from './withLocalize';
import ExpensiPicker from './ExpensiPicker';
-import Text from './Text';
+import ExpensifyText from './ExpensifyText';
import * as ReimbursementAccountUtils from '../libs/ReimbursementAccountUtils';
import ReimbursementAccountForm from '../pages/ReimbursementAccount/ReimbursementAccountForm';
import getBankIcon from './Icon/BankIcons';
@@ -176,7 +176,7 @@ class AddPlaidBankAccount extends React.Component {
onSubmit={this.selectAccount}
>
{!_.isEmpty(this.props.text) && (
- {this.props.text}
+ {this.props.text}
)}
- {this.state.institution.name}
+ {this.state.institution.name}
- linkRef = el}
style={StyleSheet.flatten(this.props.style)}
accessibilityRole="link"
@@ -82,7 +82,7 @@ class BaseAnchorForCommentsOnly extends React.Component {
{...rest}
>
{this.props.children}
-
+
)
);
diff --git a/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly/index.native.js b/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly/index.native.js
index c150a300b4ef..c6ced4d60543 100644
--- a/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly/index.native.js
+++ b/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly/index.native.js
@@ -4,7 +4,7 @@ import lodashGet from 'lodash/get';
import {Linking, StyleSheet, Pressable} from 'react-native';
import {propTypes, defaultProps} from '../anchorForCommentsOnlyPropTypes';
import fileDownload from '../../../libs/fileDownload';
-import Text from '../../Text';
+import ExpensifyText from '../../ExpensifyText';
import PressableWithSecondaryInteraction from '../../PressableWithSecondaryInteraction';
import * as ReportActionContextMenu from '../../../pages/home/report/ContextMenu/ReportActionContextMenu';
import * as ContextMenuActions from '../../../pages/home/report/ContextMenu/ContextMenuActions';
@@ -73,14 +73,14 @@ class BaseAnchorForCommentsOnly extends React.Component {
}
onPress={() => Linking.openURL(this.props.href)}
>
- linkRef = el}
style={StyleSheet.flatten(this.props.style)}
// eslint-disable-next-line react/jsx-props-no-spreading
{...rest}
>
{this.props.children}
-
+
)
);
diff --git a/src/components/AttachmentModal.js b/src/components/AttachmentModal.js
index 437127e429b0..fd81a1a478bb 100755
--- a/src/components/AttachmentModal.js
+++ b/src/components/AttachmentModal.js
@@ -11,7 +11,7 @@ import themeColors from '../styles/themes/default';
import addEncryptedAuthTokenToURL from '../libs/addEncryptedAuthTokenToURL';
import compose from '../libs/compose';
import withWindowDimensions, {windowDimensionsPropTypes} from './withWindowDimensions';
-import Button from './Button';
+import ExpensifyButton from './ExpensifyButton';
import HeaderWithCloseButton from './HeaderWithCloseButton';
import fileDownload from '../libs/fileDownload';
import withLocalize, {withLocalizePropTypes} from './withLocalize';
@@ -153,7 +153,7 @@ class AttachmentModal extends PureComponent {
{/* If we have an onConfirm method show a confirmation button */}
{this.props.onConfirm && (
-
- {props.file && props.file.name}
+ {props.file && props.file.name}
{!props.shouldShowLoadingSpinnerIcon && props.shouldShowDownloadIcon && (
diff --git a/src/components/Badge.js b/src/components/Badge.js
index ee840af8d5ae..afa6e88eae43 100644
--- a/src/components/Badge.js
+++ b/src/components/Badge.js
@@ -3,7 +3,7 @@ import {Pressable, View} from 'react-native';
import PropTypes from 'prop-types';
import styles from '../styles/styles';
import * as StyleUtils from '../styles/StyleUtils';
-import Text from './Text';
+import ExpensifyText from './ExpensifyText';
const propTypes = {
/** Is Success type */
@@ -48,12 +48,12 @@ const Badge = (props) => {
style={props.pressable ? wrapperStyles : wrapperStyles(false)}
onPress={props.onPress}
>
-
{props.text}
-
+
);
};
diff --git a/src/components/BigNumberPad.js b/src/components/BigNumberPad.js
index 26299c661b8f..f5c6d8eee3fe 100644
--- a/src/components/BigNumberPad.js
+++ b/src/components/BigNumberPad.js
@@ -3,7 +3,7 @@ import {View} from 'react-native';
import _ from 'underscore';
import PropTypes from 'prop-types';
import styles from '../styles/styles';
-import Button from './Button';
+import ExpensifyButton from './ExpensifyButton';
const propTypes = {
/** Callback to inform parent modal with key pressed */
@@ -26,7 +26,7 @@ const BigNumberPad = props => (
// avoid unccessary space before the first column.
const marginLeft = columnIndex > 0 ? styles.ml3 : {};
return (
- (
- (
shouldRemoveRightBorderRadius
style={[styles.flex1]}
/>
-
) : (
- {
]}
>
{props.label && (
-
+
{props.label}
-
+
)}
{LabelComponent && ()}
diff --git a/src/components/CollapsibleSection/index.js b/src/components/CollapsibleSection/index.js
index 2a423e568930..4f36fc72ef6c 100644
--- a/src/components/CollapsibleSection/index.js
+++ b/src/components/CollapsibleSection/index.js
@@ -2,7 +2,7 @@ import React from 'react';
import {View, TouchableOpacity} from 'react-native';
import PropTypes from 'prop-types';
import Collapsible from './Collapsible';
-import Text from '../Text';
+import ExpensifyText from '../ExpensifyText';
import styles from '../../styles/styles';
import Icon from '../Icon';
import * as Expensicons from '../Icon/Expensicons';
@@ -39,9 +39,9 @@ class CollapsibleSection extends React.Component {
return (
-
+
{this.props.title}
-
+
diff --git a/src/components/ConfirmModal.js b/src/components/ConfirmModal.js
index 3dcc904e65d4..c15ad92cc96b 100755
--- a/src/components/ConfirmModal.js
+++ b/src/components/ConfirmModal.js
@@ -9,8 +9,8 @@ import CONST from '../CONST';
import withWindowDimensions, {windowDimensionsPropTypes} from './withWindowDimensions';
import withLocalize, {withLocalizePropTypes} from './withLocalize';
import compose from '../libs/compose';
-import Button from './Button';
-import Text from './Text';
+import ExpensifyButton from './ExpensifyButton';
+import ExpensifyText from './ExpensifyText';
const propTypes = {
/** Title of the modal */
@@ -70,12 +70,12 @@ const ConfirmModal = props => (
{_.isString(props.prompt)
? (
-
+
{props.prompt}
-
+
) : (props.prompt)}
- (
/>
{props.shouldShowCancelButton
&& (
-
- {this.props.text}
+ {this.props.text}
-
+
);
}
}
diff --git a/src/components/DisplayNames/index.js b/src/components/DisplayNames/index.js
index e58b08561d6a..29bd4d9612b4 100644
--- a/src/components/DisplayNames/index.js
+++ b/src/components/DisplayNames/index.js
@@ -4,7 +4,7 @@ import {View} from 'react-native';
import {propTypes, defaultProps} from './displayNamesPropTypes';
import styles from '../../styles/styles';
import Tooltip from '../Tooltip';
-import Text from '../Text';
+import ExpensifyText from '../ExpensifyText';
class DisplayNames extends PureComponent {
constructor(props) {
@@ -69,21 +69,21 @@ class DisplayNames extends PureComponent {
render() {
if (!this.props.tooltipEnabled) {
- // No need for any complex text-splitting, just return a simple text component
+ // No need for any complex text-splitting, just return a simple ExpensifyText component
return (
-
{this.props.fullTitle}
-
+
);
}
return (
// Tokenization of string only support 1 numberOfLines on Web
-
{/* // We need to get the refs to all the names which will be used to correct
the horizontal position of the tooltip */}
- this.childRefs[index] = el}>
+ this.childRefs[index] = el}>
{displayName}
-
+
- {index < this.props.displayNamesWithTooltips.length - 1 && , }
+ {index < this.props.displayNamesWithTooltips.length - 1 && , }
))}
{this.props.displayNamesWithTooltips.length > 1 && this.state.isEllipsisActive
@@ -113,11 +113,11 @@ class DisplayNames extends PureComponent {
{/* There is some Gap for real ellipsis so we are adding 4 `.` to cover */}
- ....
+ ....
)}
-
+
);
}
}
diff --git a/src/components/DisplayNames/index.native.js b/src/components/DisplayNames/index.native.js
index 6ccb53888fd6..20ecd3e70029 100644
--- a/src/components/DisplayNames/index.native.js
+++ b/src/components/DisplayNames/index.native.js
@@ -1,12 +1,12 @@
import React from 'react';
import {propTypes, defaultProps} from './displayNamesPropTypes';
-import Text from '../Text';
+import ExpensifyText from '../ExpensifyText';
// As we don't have to show tooltips of the Native platform so we simply render the full display names list.
const DisplayNames = props => (
-
+
{props.fullTitle}
-
+
);
DisplayNames.propTypes = propTypes;
diff --git a/src/components/EmptyStateAvatars.js b/src/components/EmptyStateAvatars.js
index 9fb5624b6c3f..fec82515b17f 100644
--- a/src/components/EmptyStateAvatars.js
+++ b/src/components/EmptyStateAvatars.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import {Image, View} from 'react-native';
import _ from 'underscore';
import styles from '../styles/styles';
-import Text from './Text';
+import ExpensifyText from './ExpensifyText';
import CONST from '../CONST';
import Avatar from './Avatar';
@@ -53,9 +53,9 @@ const EmptyStateAvatars = (props) => {
styles.screenBlur,
]}
/>
-
+
{`+${props.avatarImageURLs.length - CONST.REPORT.MAX_PREVIEW_AVATARS}`}
-
+
>
)}
diff --git a/src/components/Button.js b/src/components/ExpensifyButton.js
similarity index 96%
rename from src/components/Button.js
rename to src/components/ExpensifyButton.js
index 8e346c96358e..5655508b2834 100644
--- a/src/components/Button.js
+++ b/src/components/ExpensifyButton.js
@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
import styles from '../styles/styles';
import themeColors from '../styles/themes/default';
import OpacityView from './OpacityView';
-import Text from './Text';
+import ExpensifyText from './ExpensifyText';
import KeyboardShortcut from '../libs/KeyboardShortcut';
import Icon from './Icon';
import CONST from '../CONST';
@@ -78,7 +78,7 @@ const defaultProps = {
shouldRemoveLeftBorderRadius: false,
};
-class Button extends Component {
+class ExpensifyButton extends Component {
constructor(props) {
super(props);
this.additionalStyles = _.isArray(this.props.style) ? this.props.style : [this.props.style];
@@ -121,7 +121,7 @@ class Button extends Component {
}
const textComponent = (
-
{this.props.text}
-
+
);
if (this.props.icon) {
@@ -190,7 +190,7 @@ class Button extends Component {
}
}
-Button.propTypes = propTypes;
-Button.defaultProps = defaultProps;
+ExpensifyButton.propTypes = propTypes;
+ExpensifyButton.defaultProps = defaultProps;
-export default Button;
+export default ExpensifyButton;
diff --git a/src/components/Text.js b/src/components/ExpensifyText.js
similarity index 90%
rename from src/components/Text.js
rename to src/components/ExpensifyText.js
index 2aebe5b69ce1..2540645fd7d0 100644
--- a/src/components/Text.js
+++ b/src/components/ExpensifyText.js
@@ -36,7 +36,7 @@ const defaultProps = {
style: {},
};
-const Text = React.forwardRef(({
+const ExpensifyText = React.forwardRef(({
color,
fontSize,
textAlign,
@@ -68,8 +68,8 @@ const Text = React.forwardRef(({
);
});
-Text.propTypes = propTypes;
-Text.defaultProps = defaultProps;
-Text.displayName = 'Text';
+ExpensifyText.propTypes = propTypes;
+ExpensifyText.defaultProps = defaultProps;
+ExpensifyText.displayName = 'ExpensifyText';
-export default Text;
+export default ExpensifyText;
diff --git a/src/components/FormAlertWithSubmitButton.js b/src/components/FormAlertWithSubmitButton.js
index 9c90472b016c..c3071c1b7ed1 100644
--- a/src/components/FormAlertWithSubmitButton.js
+++ b/src/components/FormAlertWithSubmitButton.js
@@ -6,10 +6,10 @@ import styles from '../styles/styles';
import Icon from './Icon';
import * as Expensicons from './Icon/Expensicons';
import colors from '../styles/colors';
-import Button from './Button';
+import ExpensifyButton from './ExpensifyButton';
import withLocalize, {withLocalizePropTypes} from './withLocalize';
import TextLink from './TextLink';
-import Text from './Text';
+import ExpensifyText from './ExpensifyText';
import RenderHTML from './RenderHTML';
const propTypes = {
@@ -65,24 +65,24 @@ const FormAlertWithSubmitButton = (props) => {
);
} else {
error = (
- {props.message}
+ {props.message}
);
}
} else {
error = (
<>
-
+
{`${props.translate('common.please')} `}
-
+
{props.translate('common.fixTheErrors')}
-
+
{` ${props.translate('common.inTheFormBeforeContinuing')}.`}
-
+
>
);
}
@@ -102,7 +102,7 @@ const FormAlertWithSubmitButton = (props) => {
{getAlertPrompt()}
)}
-
-
+
{this.state.bodyText}
-
+
diff --git a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js
index a97b8a70e18d..dde03521f639 100755
--- a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js
+++ b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.js
@@ -21,7 +21,7 @@ import AttachmentModal from '../AttachmentModal';
import ThumbnailImage from '../ThumbnailImage';
import variables from '../../styles/variables';
import themeColors from '../../styles/themes/default';
-import Text from '../Text';
+import ExpensifyText from '../ExpensifyText';
import withLocalize from '../withLocalize';
import Navigation from '../../libs/Navigation/Navigation';
import CONST from '../../CONST';
@@ -99,28 +99,28 @@ function AnchorRenderer(props) {
// instead of in a new tab or with a page refresh (which is the default behavior of an anchor tag)
if (internalExpensifyPath) {
return (
- Navigation.navigate(internalExpensifyPath)}
>
-
+
);
}
if (!isInsideComment(props.tnode)) {
// This is not a comment from a chat, the AnchorForCommentsOnly uses a Pressable to create a context menu on right click.
// We don't have this behaviour in other links in NewDot
- // TODO: We should use TextLink, but I'm leaving it as Text for now because TextLink breaks the alignment in Android.
+ // TODO: We should use TextLink, but I'm leaving it as ExpensifyText for now because TextLink breaks the alignment in Android.
return (
- {
Linking.openURL(attrHref);
}}
>
-
+
);
}
@@ -182,16 +182,16 @@ function CodeRenderer(props) {
function EditedRenderer(props) {
const defaultRendererProps = _.omit(props, ['TDefaultRenderer', 'style', 'tnode']);
return (
-
{/* Native devices do not support margin between nested text */}
- {' '}
+ {' '}
{props.translate('reportActionCompose.edited')}
-
+
);
}
diff --git a/src/components/Header.js b/src/components/Header.js
index c692b028fab3..ea95f00af229 100644
--- a/src/components/Header.js
+++ b/src/components/Header.js
@@ -2,7 +2,7 @@ import React from 'react';
import {View} from 'react-native';
import PropTypes from 'prop-types';
import styles from '../styles/styles';
-import Text from './Text';
+import ExpensifyText from './ExpensifyText';
import EnvironmentBadge from './EnvironmentBadge';
const propTypes = {
@@ -23,11 +23,11 @@ const defaultProps = {
const Header = props => (
-
+
{props.title}
-
+
{/* If there's no subtitle then display a fragment to avoid an empty space which moves the main title */}
- {props.subtitle ? {props.subtitle} : <>> }
+ {props.subtitle ? {props.subtitle} : <>> }
{props.shouldShowEnvironmentBadge && (
diff --git a/src/components/IOUConfirmationList.js b/src/components/IOUConfirmationList.js
index 391ed1cc986b..d4afada746ac 100755
--- a/src/components/IOUConfirmationList.js
+++ b/src/components/IOUConfirmationList.js
@@ -5,7 +5,7 @@ import {ScrollView} from 'react-native-gesture-handler';
import {withOnyx} from 'react-native-onyx';
import _ from 'underscore';
import styles from '../styles/styles';
-import Text from './Text';
+import ExpensifyText from './ExpensifyText';
import themeColors from '../styles/themes/default';
import * as OptionsListUtils from '../libs/OptionsListUtils';
import OptionsList from './OptionsList';
@@ -431,9 +431,9 @@ class IOUConfirmationList extends Component {
{this.props.network.isOffline && (
-
+
{this.props.translate('session.offlineMessage')}
-
+
)}
(
text={props.translate('requestCallPage.callButtonTooltip')}
containerStyles={[styles.justifyContentCenter, styles.alignItemsCenter]}
>
- {
Navigation.navigate(ROUTES.getRequestCallRoute(props.taskID));
}}
diff --git a/src/components/InlineCodeBlock/WrappedText.js b/src/components/InlineCodeBlock/WrappedText.js
index be693e534b11..c93f4733dd30 100644
--- a/src/components/InlineCodeBlock/WrappedText.js
+++ b/src/components/InlineCodeBlock/WrappedText.js
@@ -3,7 +3,7 @@ import React, {Fragment} from 'react';
import {View} from 'react-native';
import PropTypes from 'prop-types';
import styles from '../../styles/styles';
-import Text from '../Text';
+import ExpensifyText from '../ExpensifyText';
/**
* Breaks the text into matrix
@@ -59,7 +59,7 @@ const WrappedText = (props) => {
colIndex === rowText.length - 1 && styles.codeLastWordStyle,
]}
>
- {colText}
+ {colText}
))}
diff --git a/src/components/InlineErrorText.js b/src/components/InlineErrorText.js
index 90f6838e19bc..432eb969c31f 100644
--- a/src/components/InlineErrorText.js
+++ b/src/components/InlineErrorText.js
@@ -2,7 +2,7 @@ import _ from 'underscore';
import React from 'react';
import PropTypes from 'prop-types';
import styles from '../styles/styles';
-import Text from './Text';
+import ExpensifyText from './ExpensifyText';
const propTypes = {
/** Text to display */
@@ -19,7 +19,7 @@ const InlineErrorText = (props) => {
}
return (
- {props.children}
+ {props.children}
);
};
diff --git a/src/components/KeyboardShortcutsModal.js b/src/components/KeyboardShortcutsModal.js
index a13b94d16446..a49f4149dec9 100644
--- a/src/components/KeyboardShortcutsModal.js
+++ b/src/components/KeyboardShortcutsModal.js
@@ -2,7 +2,7 @@ import React from 'react';
import {View} from 'react-native';
import _ from 'underscore';
import HeaderWithCloseButton from './HeaderWithCloseButton';
-import Text from './Text';
+import ExpensifyText from './ExpensifyText';
import Modal from './Modal';
import CONST from '../CONST';
import styles from '../styles/styles';
@@ -71,10 +71,10 @@ class KeyboardShortcutsModal extends React.Component {
key={shortcut.displayName}
>
- {shortcut.displayName}
+ {shortcut.displayName}
- {this.props.translate(`keyboardShortcutModal.shortcuts.${shortcut.descriptionKey}`)}
+ {this.props.translate(`keyboardShortcutModal.shortcuts.${shortcut.descriptionKey}`)}
);
@@ -93,7 +93,7 @@ class KeyboardShortcutsModal extends React.Component {
>
- {this.props.translate('keyboardShortcutModal.subtitle')}
+ {this.props.translate('keyboardShortcutModal.subtitle')}
{_.map(shortcuts, (shortcut, index) => {
diff --git a/src/components/MenuItem.js b/src/components/MenuItem.js
index 2f9e261d82e3..63d30771cbe5 100644
--- a/src/components/MenuItem.js
+++ b/src/components/MenuItem.js
@@ -3,7 +3,7 @@ import React from 'react';
import {
View, Pressable,
} from 'react-native';
-import Text from './Text';
+import ExpensifyText from './ExpensifyText';
import styles from '../styles/styles';
import * as StyleUtils from '../styles/StyleUtils';
import Icon from './Icon';
@@ -88,7 +88,7 @@ const MenuItem = props => (
)}
- (
numberOfLines={1}
>
{props.title}
-
+
{props.description && (
-
+
{props.description}
-
+
)}
@@ -109,11 +109,11 @@ const MenuItem = props => (
{props.badgeText && }
{props.subtitle && (
-
{props.subtitle}
-
+
)}
{props.shouldShowRightIcon && (
diff --git a/src/components/MultipleAvatars.js b/src/components/MultipleAvatars.js
index fb6d51ca52d9..ce0d366b568c 100644
--- a/src/components/MultipleAvatars.js
+++ b/src/components/MultipleAvatars.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import {Image, View} from 'react-native';
import styles from '../styles/styles';
import Avatar from './Avatar';
-import Text from './Text';
+import ExpensifyText from './ExpensifyText';
const propTypes = {
/** Array of avatar URL */
@@ -77,12 +77,12 @@ const MultipleAvatars = (props) => {
-
{`+${props.avatarImageURLs.length - 1}`}
-
+
)}
diff --git a/src/components/OptionsList/BaseOptionsList.js b/src/components/OptionsList/BaseOptionsList.js
index f11ef7c84ab4..7a653e9e62a9 100644
--- a/src/components/OptionsList/BaseOptionsList.js
+++ b/src/components/OptionsList/BaseOptionsList.js
@@ -6,7 +6,7 @@ import Log from '../../libs/Log';
import styles from '../../styles/styles';
import OptionRow from '../../pages/home/sidebar/OptionRow';
import SectionList from '../SectionList';
-import Text from '../Text';
+import ExpensifyText from '../ExpensifyText';
import {propTypes as optionsListPropTypes, defaultProps as optionsListDefaultProps} from './optionsListPropTypes';
const propTypes = {
@@ -130,9 +130,9 @@ class BaseOptionsList extends Component {
if (title && shouldShow && !this.props.hideSectionHeaders) {
return (
-
+
{title}
-
+
);
}
@@ -145,9 +145,9 @@ class BaseOptionsList extends Component {
{this.props.headerMessage ? (
-
+
{this.props.headerMessage}
-
+
) : null}
{!_.isEmpty(this.props.headerText) && (
-
{this.props.headerText}
-
+
)}
{_.map(this.props.menuItems, item => (
diff --git a/src/components/ReimbursementAccountLoadingIndicator.js b/src/components/ReimbursementAccountLoadingIndicator.js
index 8c122600f162..61537e9fd2f2 100644
--- a/src/components/ReimbursementAccountLoadingIndicator.js
+++ b/src/components/ReimbursementAccountLoadingIndicator.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
import styles from '../styles/styles';
import CONST from '../CONST';
import withLocalize, {withLocalizePropTypes} from './withLocalize';
-import Text from './Text';
+import ExpensifyText from './ExpensifyText';
import HeaderWithCloseButton from './HeaderWithCloseButton';
import Navigation from '../libs/Navigation/Navigation';
import ScreenWrapper from './ScreenWrapper';
@@ -32,9 +32,9 @@ const ReimbursementAccountLoadingIndicator = props => (
]}
/>
-
+
{props.translate('reimbursementAccountLoadingAnimation.explanationLine')}
-
+
) : (
diff --git a/src/components/ReportActionItem/IOUPreview.js b/src/components/ReportActionItem/IOUPreview.js
index c76d1ce450d7..d7f21e9abbb4 100644
--- a/src/components/ReportActionItem/IOUPreview.js
+++ b/src/components/ReportActionItem/IOUPreview.js
@@ -20,7 +20,7 @@ import themeColors from '../../styles/themes/default';
import Icon from '../Icon';
import CONST from '../../CONST';
import * as Expensicons from '../Icon/Expensicons';
-import Text from '../Text';
+import ExpensifyText from '../ExpensifyText';
const propTypes = {
/** Additional logic for displaying the pay button */
@@ -111,9 +111,9 @@ const IOUPreview = (props) => {
-
+
{cachedTotal}
-
+
{!props.iouReport.hasOutstandingIOU && (
@@ -128,11 +128,11 @@ const IOUPreview = (props) => {
/>
-
+
{props.iouReport.hasOutstandingIOU
? props.translate('iou.owes', {manager: managerName, owner: ownerName})
: props.translate('iou.paid', {manager: managerName, owner: ownerName})}
-
+
{(isCurrentUserManager
&& !props.shouldHidePayButton
&& props.iouReport.stateNum === CONST.REPORT.STATE_NUM.PROCESSING && (
@@ -140,14 +140,14 @@ const IOUPreview = (props) => {
style={[styles.buttonSmall, styles.buttonSuccess, styles.mt4]}
onPress={props.onPayButtonPressed}
>
-
{props.translate('iou.pay')}
-
+
))}
diff --git a/src/components/ReportActionItem/IOUQuote.js b/src/components/ReportActionItem/IOUQuote.js
index 84b4b3577288..73607a4e7e6f 100644
--- a/src/components/ReportActionItem/IOUQuote.js
+++ b/src/components/ReportActionItem/IOUQuote.js
@@ -3,7 +3,7 @@ import {View} from 'react-native';
import PropTypes from 'prop-types';
import _ from 'underscore';
import Str from 'expensify-common/lib/str';
-import Text from '../Text';
+import ExpensifyText from '../ExpensifyText';
import styles from '../../styles/styles';
import reportActionPropTypes from '../../pages/home/report/reportActionPropTypes';
import withLocalize, {withLocalizePropTypes} from '../withLocalize';
@@ -30,16 +30,16 @@ const IOUQuote = props => (
{_.map(props.action.message, (fragment, index) => (
-
+
{Str.htmlDecode(fragment.text)}
-
+
{props.shouldShowViewDetailsLink && (
-
{props.translate('iou.viewDetails')}
-
+
)}
))}
diff --git a/src/components/ReportTransaction.js b/src/components/ReportTransaction.js
index 599fa482c4b0..c82facf47c40 100644
--- a/src/components/ReportTransaction.js
+++ b/src/components/ReportTransaction.js
@@ -12,7 +12,7 @@ import themeColors from '../styles/themes/default';
import * as IOU from '../libs/actions/IOU';
import reportActionPropTypes from '../pages/home/report/reportActionPropTypes';
import ReportActionItemSingle from '../pages/home/report/ReportActionItemSingle';
-import Text from './Text';
+import ExpensifyText from './ExpensifyText';
const propTypes = {
/** The chatReport which the transaction is associated with */
@@ -82,9 +82,9 @@ class ReportTransaction extends Component {
action={this.props.action}
wrapperStyles={[styles.reportTransactionWrapper]}
>
-
+
{this.props.action.message[0].text}
-
+
{this.props.canBeRejected && (
@@ -106,9 +106,9 @@ class ReportTransaction extends Component {
/>
)
: (
-
+
{this.props.rejectButtonLabelText}
-
+
)
}
diff --git a/src/components/ReportWelcomeText.js b/src/components/ReportWelcomeText.js
index 480b65336e06..dd285773e348 100644
--- a/src/components/ReportWelcomeText.js
+++ b/src/components/ReportWelcomeText.js
@@ -5,7 +5,7 @@ import Str from 'expensify-common/lib/str';
import {withOnyx} from 'react-native-onyx';
import _ from 'underscore';
import styles from '../styles/styles';
-import Text from './Text';
+import ExpensifyText from './ExpensifyText';
import withLocalize, {withLocalizePropTypes} from './withLocalize';
import compose from '../libs/compose';
import * as OptionsListUtils from '../libs/OptionsListUtils';
@@ -69,31 +69,31 @@ const ReportWelcomeText = (props) => {
const chatUsers = props.shouldIncludeParticipants ? displayNamesWithTooltips : [{displayName: props.report.reportName}];
return (
-
-
+
+
{!props.shouldIncludeParticipants
? `${props.translate('reportActionsView.beginningOfChatHistoryPrivatePartOne')}`
: `${props.translate('reportActionsView.beginningOfChatHistory')} `}
-
- {!props.shouldIncludeParticipants && {` ${lodashGet(chatUsers, '[0].displayName', '')}`}}
- {!props.shouldIncludeParticipants && {props.translate('reportActionsView.beginningOfChatHistoryPrivatePartTwo')}}
+
+ {!props.shouldIncludeParticipants && {` ${lodashGet(chatUsers, '[0].displayName', '')}`}}
+ {!props.shouldIncludeParticipants && {props.translate('reportActionsView.beginningOfChatHistoryPrivatePartTwo')}}
{props.shouldIncludeParticipants
&& (
<>
{_.map(chatUsers, ({displayName, pronouns}, index) => (
-
-
+
+
{displayName}
-
- {!_.isEmpty(pronouns) && {` (${pronouns})`}}
- {(index === chatUsers.length - 1) && .}
- {(index === chatUsers.length - 2) && {` ${props.translate('common.and')} `}}
- {(index < chatUsers.length - 2) && , }
-
+
+ {!_.isEmpty(pronouns) && {` (${pronouns})`}}
+ {(index === chatUsers.length - 1) && .}
+ {(index === chatUsers.length - 2) && {` ${props.translate('common.and')} `}}
+ {(index < chatUsers.length - 2) && , }
+
))}
>
)}
-
+
);
};
diff --git a/src/components/TextInputAutoWidth.js b/src/components/TextInputAutoWidth.js
index a43eed308f4c..3ea5b6f12303 100644
--- a/src/components/TextInputAutoWidth.js
+++ b/src/components/TextInputAutoWidth.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
import _ from 'underscore';
import styles from '../styles/styles';
import * as StyleUtils from '../styles/StyleUtils';
-import Text from './Text';
+import ExpensifyText from './ExpensifyText';
import TextInputFocusable from './TextInputFocusable';
const propTypes = {
@@ -56,14 +56,14 @@ class TextInputAutoWidth extends React.Component {
Text input component doesn't support auto grow by default.
We're using a hidden text input to achieve that.
This text view is used to calculate width of the input value given textStyle in this component.
- This text component is intentionally positioned out of the screen.
+ This ExpensifyText component is intentionally positioned out of the screen.
*/}
- this.setState({textInputWidth: e.nativeEvent.layout.width})}
>
{this.props.value || this.props.placeholder}
-
+
>
);
}
diff --git a/src/components/TextInputWithLabel.js b/src/components/TextInputWithLabel.js
index 310a4a91ca31..e78dc3289455 100644
--- a/src/components/TextInputWithLabel.js
+++ b/src/components/TextInputWithLabel.js
@@ -3,7 +3,7 @@ import React from 'react';
import {View, TextInput} from 'react-native';
import PropTypes from 'prop-types';
import styles from '../styles/styles';
-import Text from './Text';
+import ExpensifyText from './ExpensifyText';
import TextLink from './TextLink';
const propTypes = {
@@ -43,7 +43,7 @@ const TextInputWithLabel = props => (
(!_.isEmpty(props.label) && !_.isEmpty(props.helpLinkURL)) ? styles.alignItemsBaseline : undefined,
]}
>
- {!_.isEmpty(props.label) && {props.label}}
+ {!_.isEmpty(props.label) && {props.label}}
{!_.isEmpty(props.helpLinkURL) && (
(
{..._.omit(props, ['label', 'errorText'])}
/>
{props.errorText !== '' && (
- {props.errorText}
+ {props.errorText}
)}
);
diff --git a/src/components/TextLink.js b/src/components/TextLink.js
index 8a56af8341ad..616634a6568e 100644
--- a/src/components/TextLink.js
+++ b/src/components/TextLink.js
@@ -2,7 +2,7 @@ import _ from 'underscore';
import React from 'react';
import PropTypes from 'prop-types';
import {Linking} from 'react-native';
-import Text from './Text';
+import ExpensifyText from './ExpensifyText';
import styles from '../styles/styles';
import stylePropTypes from '../styles/stylePropTypes';
@@ -33,7 +33,7 @@ const defaultProps = {
const TextLink = (props) => {
const additionalStyles = _.isArray(props.style) ? props.style : [props.style];
return (
- {
}}
>
{props.children}
-
+
);
};
diff --git a/src/components/Tooltip/TooltipRenderedOnPageBody.js b/src/components/Tooltip/TooltipRenderedOnPageBody.js
index 3ed7c472883b..a9e9ee7a4029 100644
--- a/src/components/Tooltip/TooltipRenderedOnPageBody.js
+++ b/src/components/Tooltip/TooltipRenderedOnPageBody.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import {Animated, View} from 'react-native';
import ReactDOM from 'react-dom';
import getTooltipStyles from '../../styles/getTooltipStyles';
-import Text from '../Text';
+import ExpensifyText from '../ExpensifyText';
const propTypes = {
/** Window width */
@@ -76,7 +76,7 @@ const TooltipRenderedOnPageBody = (props) => {
onLayout={props.measureTooltip}
style={[tooltipWrapperStyle, animationStyle]}
>
- {props.text}
+ {props.text}
diff --git a/src/components/UnorderedList.js b/src/components/UnorderedList.js
index a0efcf3ed069..5bc1d7c7876a 100644
--- a/src/components/UnorderedList.js
+++ b/src/components/UnorderedList.js
@@ -2,7 +2,7 @@ import React from 'react';
import _ from 'underscore';
import {View} from 'react-native';
import PropTypes from 'prop-types';
-import Text from './Text';
+import ExpensifyText from './ExpensifyText';
import styles from '../styles/styles';
const propTypes = {
@@ -20,8 +20,8 @@ const UnorderedList = props => (
key={itemText}
style={[styles.flexRow, styles.alignItemsStart, styles.ml2]}
>
- {'\u2022'}
- {itemText}
+ {'\u2022'}
+ {itemText}
))}
>
diff --git a/src/components/UnreadActionIndicator.js b/src/components/UnreadActionIndicator.js
index 389413e4f38e..4b7b5c85772c 100755
--- a/src/components/UnreadActionIndicator.js
+++ b/src/components/UnreadActionIndicator.js
@@ -1,15 +1,15 @@
import React from 'react';
import {View} from 'react-native';
import styles from '../styles/styles';
-import Text from './Text';
+import ExpensifyText from './ExpensifyText';
import withLocalize, {withLocalizePropTypes} from './withLocalize';
const UnreadActionIndicator = props => (
-
+
{props.translate('common.new')}
-
+
);
diff --git a/src/components/WelcomeText.js b/src/components/WelcomeText.js
index 1180b5df2e3a..80bb57840975 100755
--- a/src/components/WelcomeText.js
+++ b/src/components/WelcomeText.js
@@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import styles from '../styles/styles';
import withLocalize, {withLocalizePropTypes} from './withLocalize';
-import Text from './Text';
+import ExpensifyText from './ExpensifyText';
const propTypes = {
@@ -20,14 +20,14 @@ const WelcomeText = (props) => {
const textSize = props.smallFontSize ? styles.textLabel : undefined;
return (
<>
-
+
{props.translate('welcomeText.phrase1')}
-
-
+
+
{props.translate('welcomeText.phrase2')}
{' '}
{props.translate('welcomeText.phrase3')}
-
+
>
);
};
diff --git a/src/pages/DetailsPage.js b/src/pages/DetailsPage.js
index c92874175396..771b5bba2937 100755
--- a/src/pages/DetailsPage.js
+++ b/src/pages/DetailsPage.js
@@ -5,7 +5,7 @@ import {withOnyx} from 'react-native-onyx';
import Str from 'expensify-common/lib/str';
import moment from 'moment';
import styles from '../styles/styles';
-import Text from '../components/Text';
+import ExpensifyText from '../components/ExpensifyText';
import ONYXKEYS from '../ONYXKEYS';
import Avatar from '../components/Avatar';
import HeaderWithCloseButton from '../components/HeaderWithCloseButton';
@@ -101,51 +101,51 @@ const DetailsPage = (props) => {
source={details.avatar}
/>
{details.displayName && (
-
+
{isSMSLogin ? props.toLocalPhone(details.displayName) : details.displayName}
-
+
)}
{details.login ? (
-
+
{props.translate(isSMSLogin
? 'common.phoneNumber'
: 'common.email')}
-
+
-
+
{isSMSLogin
? props.toLocalPhone(getPhoneNumber(details))
: details.login}
-
+
) : null}
{pronouns ? (
-
+
{props.translate('profilePage.preferredPronouns')}
-
-
+
+
{pronouns}
-
+
) : null}
{shouldShowLocalTime && details.timezone ? (
-
+
{props.translate('detailsPage.localTime')}
-
-
+
+
{timezone.format('LT')}
{' '}
{currentTime}
-
+
) : null}
diff --git a/src/pages/EnablePayments/ActivateStep.js b/src/pages/EnablePayments/ActivateStep.js
index 846c89a56a5e..278833135d47 100644
--- a/src/pages/EnablePayments/ActivateStep.js
+++ b/src/pages/EnablePayments/ActivateStep.js
@@ -7,7 +7,7 @@ import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize
import styles from '../../styles/styles';
import userWalletPropTypes from './userWalletPropTypes';
import CONST from '../../CONST';
-import Text from '../../components/Text';
+import ExpensifyText from '../../components/ExpensifyText';
const propTypes = {
...withLocalizePropTypes,
@@ -26,10 +26,10 @@ const ActivateStep = props => (
/>
{props.userWallet.tierName === CONST.WALLET.TIER_NAME.GOLD && (
- {props.translate('activateStep.activated')}
+ {props.translate('activateStep.activated')}
)}
{props.userWallet.tierName === CONST.WALLET.TIER_NAME.SILVER && (
- {props.translate('activateStep.checkBackLater')}
+ {props.translate('activateStep.checkBackLater')}
)}
diff --git a/src/pages/EnablePayments/AdditionalDetailsStep.js b/src/pages/EnablePayments/AdditionalDetailsStep.js
index 3d80857894a0..46e1c772dde5 100644
--- a/src/pages/EnablePayments/AdditionalDetailsStep.js
+++ b/src/pages/EnablePayments/AdditionalDetailsStep.js
@@ -10,8 +10,8 @@ import HeaderWithCloseButton from '../../components/HeaderWithCloseButton';
import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
import Navigation from '../../libs/Navigation/Navigation';
import styles from '../../styles/styles';
-import Button from '../../components/Button';
-import Text from '../../components/Text';
+import ExpensifyButton from '../../components/ExpensifyButton';
+import ExpensifyText from '../../components/ExpensifyText';
import * as BankAccounts from '../../libs/actions/BankAccounts';
import CONST from '../../CONST';
import compose from '../../libs/compose';
@@ -118,7 +118,7 @@ class AdditionalDetailsStep extends React.Component {
/>
- {this.props.translate('additionalDetailsStep.helpText')}
+ {this.props.translate('additionalDetailsStep.helpText')}
- {field.fieldName === 'addressStreet' && {this.props.translate('common.noPO')}}
+ {field.fieldName === 'addressStreet' && {this.props.translate('common.noPO')}}
>
))}
{this.props.walletAdditionalDetails.additionalErrorMessage.length > 0 && (
-
+
{this.props.walletAdditionalDetails.additionalErrorMessage}
-
+
)}
-
-
+
{this.props.translate('onfidoStep.acceptTerms')}
.
-
+
- }
{!this.props.walletOnfidoData.loading && this.props.walletOnfidoData.error && (
<>
-
+
{this.props.walletOnfidoData.error}
-
-
+ {
diff --git a/src/pages/EnablePayments/TermsPage/LongTermsForm.js b/src/pages/EnablePayments/TermsPage/LongTermsForm.js
index 9ecfe78c690e..16a5735d05fc 100644
--- a/src/pages/EnablePayments/TermsPage/LongTermsForm.js
+++ b/src/pages/EnablePayments/TermsPage/LongTermsForm.js
@@ -2,7 +2,7 @@ import _ from 'underscore';
import React from 'react';
import {View} from 'react-native';
import styles from '../../../styles/styles';
-import Text from '../../../components/Text';
+import ExpensifyText from '../../../components/ExpensifyText';
import CollapsibleSection from '../../../components/CollapsibleSection';
import * as Localize from '../../../libs/Localize';
import CONST from '../../../CONST';
@@ -63,33 +63,33 @@ const getLongTermsSections = () => _.map(termsData, (section, index) => (
- {section.title}
+ {section.title}
{
section.subTitle
&& (
-
+
{section.subTitle}
-
+
)
}
-
+
{section.rightText}
-
+
{
section.subRightText
&& (
-
+
{section.subRightText}
-
+
)
}
-
+
{section.details}
-
+
));
@@ -99,17 +99,17 @@ const LongTermsForm = () => (
{getLongTermsSections()}
-
+
{Localize.translateLocal('termsStep.longTermsForm.fdicInsuranceBancorp')}
{' '}
{CONST.TERMS.FDIC_PREPAID}
{' '}
{Localize.translateLocal('termsStep.longTermsForm.fdicInsuranceBancorp2')}
-
-
+
+
{Localize.translateLocal('termsStep.noOverdraftOrCredit')}
-
-
+
+
{Localize.translateLocal('termsStep.longTermsForm.contactExpensifyPayments')}
{' '}
{CONST.EMAIL.CONCIERGE}
@@ -118,8 +118,8 @@ const LongTermsForm = () => (
{' '}
{CONST.NEWDOT}
.
-
-
+
+
{Localize.translateLocal('termsStep.longTermsForm.generalInformation')}
{' '}
{CONST.TERMS.CFPB_PREPAID}
@@ -128,16 +128,16 @@ const LongTermsForm = () => (
{' '}
{CONST.TERMS.CFPB_COMPLAINT}
.
-
+
- Link.openExternalLink(CONST.FEES_URL)}
>
{Localize.translateLocal('termsStep.longTermsForm.printerFriendlyView')}
-
+
>
);
diff --git a/src/pages/EnablePayments/TermsPage/ShortTermsForm.js b/src/pages/EnablePayments/TermsPage/ShortTermsForm.js
index de3b6d6b3829..3ad3db53a051 100644
--- a/src/pages/EnablePayments/TermsPage/ShortTermsForm.js
+++ b/src/pages/EnablePayments/TermsPage/ShortTermsForm.js
@@ -2,7 +2,7 @@ import _ from 'underscore';
import React from 'react';
import {View} from 'react-native';
import styles from '../../../styles/styles';
-import Text from '../../../components/Text';
+import ExpensifyText from '../../../components/ExpensifyText';
import * as Localize from '../../../libs/Localize';
import CONST from '../../../CONST';
import * as Link from '../../../libs/actions/Link';
@@ -45,83 +45,83 @@ const termsData = [
const getShortTermsSections = () => _.map(termsData, section => (
- {section.title}
+ {section.title}
{
section.subTitle
&& (
-
+
{section.subTitle}
-
+
)
}
-
+
{section.rightText}
-
+
));
const ShortTermsForm = () => (
<>
-
+
{Localize.translateLocal('termsStep.shortTermsForm.expensifyPaymentsAccount')}
-
+
{getShortTermsSections()}
-
+
{Localize.translateLocal('termsStep.shortTermsForm.weChargeOneFee')}
-
+
- {Localize.translateLocal('termsStep.electronicFundsWithdrawal')}
-
+ {Localize.translateLocal('termsStep.electronicFundsWithdrawal')}
+
{Localize.translateLocal('termsStep.instant')}
-
+
-
+
{Localize.translateLocal('termsStep.electronicFundsInstantFee')}
-
-
+
+
{Localize.translateLocal('termsStep.electronicFundsInstantFeeMin')}
-
+
-
+
{Localize.translateLocal('termsStep.noOverdraftOrCredit')}
-
-
+
+
{Localize.translateLocal('termsStep.shortTermsForm.fdicInsurance')}
-
-
+
+
{Localize.translateLocal('termsStep.shortTermsForm.generalInfo')}
{' '}
- Link.openExternalLink(CONST.CFPB_PREPAID_URL)}
>
{CONST.TERMS.CFPB_PREPAID}
-
+
.
-
-
+
+
{Localize.translateLocal('termsStep.shortTermsForm.conditionsDetails')}
{' '}
- Link.openExternalLink(CONST.FEES_URL)}
>
{CONST.TERMS.USE_EXPENSIFY_FEES}
-
+
{' '}
{Localize.translateLocal('termsStep.shortTermsForm.conditionsPhone')}
-
+
>
diff --git a/src/pages/EnablePayments/TermsStep.js b/src/pages/EnablePayments/TermsStep.js
index 0c7c541fa052..4aecfcff7dbd 100644
--- a/src/pages/EnablePayments/TermsStep.js
+++ b/src/pages/EnablePayments/TermsStep.js
@@ -6,14 +6,14 @@ import HeaderWithCloseButton from '../../components/HeaderWithCloseButton';
import Navigation from '../../libs/Navigation/Navigation';
import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
import styles from '../../styles/styles';
-import Button from '../../components/Button';
+import ExpensifyButton from '../../components/ExpensifyButton';
import * as BankAccounts from '../../libs/actions/BankAccounts';
import CONST from '../../CONST';
import TextLink from '../../components/TextLink';
import compose from '../../libs/compose';
import ONYXKEYS from '../../ONYXKEYS';
import CheckboxWithLabel from '../../components/CheckboxWithLabel';
-import Text from '../../components/Text';
+import ExpensifyText from '../../components/ExpensifyText';
import ShortTermsForm from './TermsPage/ShortTermsForm';
import LongTermsForm from './TermsPage/LongTermsForm';
import FixedFooter from '../../components/FixedFooter';
@@ -71,13 +71,13 @@ class TermsStep extends React.Component {
isChecked={this.state.hasAcceptedDisclosure}
onPress={this.toggleDisclosure}
LabelComponent={() => (
-
+
{`${this.props.translate('termsStep.haveReadAndAgree')} `}
{`${this.props.translate('termsStep.electronicDisclosures')}.`}
-
+
)}
/>
(
<>
-
+
{`${this.props.translate('termsStep.agreeToThe')} `}
-
+
{`${this.props.translate('common.privacyPolicy')} `}
- {`${this.props.translate('common.and')} `}
+ {`${this.props.translate('common.and')} `}
{`${this.props.translate('termsStep.walletAgreement')}.`}
@@ -104,12 +104,12 @@ class TermsStep extends React.Component {
/>
{this.state.error && (
-
+
{this.props.translate('termsStep.termsMustBeAccepted')}
-
+
)}
-
{this.props.isGroupChat && lodashGet(this.state, 'selectedOptions', []).length > 0 && (
-
-
- {this.props.translate('beneficialOwnersStep.checkAllThatApply')}
-
+
+ {this.props.translate('beneficialOwnersStep.checkAllThatApply')}
+
this.toggleCheckbox('ownsMoreThan25Percent')}
LabelComponent={() => (
-
+
{this.props.translate('beneficialOwnersStep.iOwnMoreThan25Percent')}
- {this.props.companyName}
-
+ {this.props.companyName}
+
)}
/>
(
-
+
{this.props.translate('beneficialOwnersStep.someoneOwnsMoreThan25Percent')}
- {this.props.companyName}
-
+ {this.props.companyName}
+
)}
/>
{this.state.hasOtherBeneficialOwners && (
{_.map(this.state.beneficialOwners, (owner, index) => (
-
+
{this.props.translate('beneficialOwnersStep.additionalOwner')}
-
+
this.clearErrorAndSetBeneficialOwnerValue(index, inputKey, value)}
@@ -256,21 +256,21 @@ class ACHContractStep extends React.Component {
{this.canAddMoreBeneficialOwners() && (
{this.props.translate('beneficialOwnersStep.addAnotherIndividual')}
- {this.props.companyName}
+ {this.props.companyName}
)}
)}
-
+
{this.props.translate('beneficialOwnersStep.agreement')}
-
+
this.toggleCheckbox('acceptTermsAndConditions')}
LabelComponent={() => (
- {this.props.translate('common.iAcceptThe')}
+ {this.props.translate('common.iAcceptThe')}
{`${this.props.translate('beneficialOwnersStep.termsAndConditions')}`}
@@ -284,7 +284,7 @@ class ACHContractStep extends React.Component {
isChecked={this.state.certifyTrueInformation}
onPress={() => this.toggleCheckbox('certifyTrueInformation')}
LabelComponent={() => (
- {this.props.translate('beneficialOwnersStep.certifyTrueAndAccurate')}
+ {this.props.translate('beneficialOwnersStep.certifyTrueAndAccurate')}
)}
errorText={this.getErrorText('certifyTrueInformation')}
hasError={this.getErrors().certifyTrueInformation}
diff --git a/src/pages/ReimbursementAccount/BankAccountStep.js b/src/pages/ReimbursementAccount/BankAccountStep.js
index c2b42f56ae43..2b20ed07ed4f 100644
--- a/src/pages/ReimbursementAccount/BankAccountStep.js
+++ b/src/pages/ReimbursementAccount/BankAccountStep.js
@@ -15,7 +15,7 @@ import AddPlaidBankAccount from '../../components/AddPlaidBankAccount';
import CheckboxWithLabel from '../../components/CheckboxWithLabel';
import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
import exampleCheckImage from './exampleCheckImage';
-import Text from '../../components/Text';
+import ExpensifyText from '../../components/ExpensifyText';
import ExpensiTextInput from '../../components/ExpensiTextInput';
import * as BankAccounts from '../../libs/actions/BankAccounts';
import ONYXKEYS from '../../ONYXKEYS';
@@ -182,9 +182,9 @@ class BankAccountStep extends React.Component {
icon={Illustrations.BankMouseGreen}
title={this.props.translate('workspace.bankAccount.streamlinePayments')}
/>
-
+
{this.props.translate('bankAccount.toGetStarted')}
-
+
{this.props.isPlaidDisabled && (
-
+
{this.props.translate('bankAccount.error.tooManyAttempts')}
-
+
)}
{!this.props.user.validated && (
-
+
-
-
+
+
{this.props.translate('bankAccount.validateAccountError')}
-
+
)}
@@ -243,9 +243,9 @@ class BankAccountStep extends React.Component {
-
+
{this.props.translate('bankAccount.checkHelpLine')}
-
+
(
-
+
{this.props.translate('common.iAcceptThe')}
-
+
{`Expensify ${this.props.translate('common.termsOfService')}`}
diff --git a/src/pages/ReimbursementAccount/CompanyStep.js b/src/pages/ReimbursementAccount/CompanyStep.js
index 90598691e239..9901aefa252c 100644
--- a/src/pages/ReimbursementAccount/CompanyStep.js
+++ b/src/pages/ReimbursementAccount/CompanyStep.js
@@ -9,7 +9,7 @@ import HeaderWithCloseButton from '../../components/HeaderWithCloseButton';
import CONST from '../../CONST';
import * as BankAccounts from '../../libs/actions/BankAccounts';
import Navigation from '../../libs/Navigation/Navigation';
-import Text from '../../components/Text';
+import ExpensifyText from '../../components/ExpensifyText';
import DatePicker from '../../components/DatePicker';
import ExpensiTextInput from '../../components/ExpensiTextInput';
import styles from '../../styles/styles';
@@ -217,7 +217,7 @@ class CompanyStep extends React.Component {
- {this.props.translate('companyStep.subtitle')}
+ {this.props.translate('companyStep.subtitle')}
- {this.props.translate('common.noPO')}
+ {this.props.translate('common.noPO')}
(
<>
- {`${this.props.translate('companyStep.confirmCompanyIsNot')} `}
+ {`${this.props.translate('companyStep.confirmCompanyIsNot')} `}
-
+
{!isUsingExpensifyCard
? this.props.translate('workspace.bankAccount.accountDescriptionNoCards')
: this.props.translate('workspace.bankAccount.accountDescriptionWithCards')}
-
+
{this.props.user.isCheckingDomain && (
-
+
{this.props.translate('workspace.card.checkingDomain')}
-
+
)}
diff --git a/src/pages/ReimbursementAccount/IdentityForm.js b/src/pages/ReimbursementAccount/IdentityForm.js
index fd6481815652..f0159d3122b4 100644
--- a/src/pages/ReimbursementAccount/IdentityForm.js
+++ b/src/pages/ReimbursementAccount/IdentityForm.js
@@ -9,7 +9,7 @@ import CONST from '../../CONST';
import DatePicker from '../../components/DatePicker';
import TextLink from '../../components/TextLink';
import StatePicker from '../../components/StatePicker';
-import Text from '../../components/Text';
+import ExpensifyText from '../../components/ExpensifyText';
const propTypes = {
@@ -140,7 +140,7 @@ const IdentityForm = (props) => {
onChangeText={value => props.onFieldChange('addressStreet', value)}
errorText={props.errors.street ? props.translate('bankAccount.error.address') : ''}
/>
- {props.translate('common.noPO')}
+ {props.translate('common.noPO')}
- {this.props.translate('bankAccount.hasPhoneLoginError')}
+ {this.props.translate('bankAccount.hasPhoneLoginError')}
);
}
@@ -185,9 +185,9 @@ class ReimbursementAccountPage extends React.Component {
if (throttledDate) {
errorComponent = (
-
+
{this.props.translate('bankAccount.hasBeenThrottledError')}
-
+
);
}
diff --git a/src/pages/ReimbursementAccount/RequestorStep.js b/src/pages/ReimbursementAccount/RequestorStep.js
index 13555bab55a6..7c4cbcff93ea 100644
--- a/src/pages/ReimbursementAccount/RequestorStep.js
+++ b/src/pages/ReimbursementAccount/RequestorStep.js
@@ -11,7 +11,7 @@ import CONST from '../../CONST';
import TextLink from '../../components/TextLink';
import Navigation from '../../libs/Navigation/Navigation';
import CheckboxWithLabel from '../../components/CheckboxWithLabel';
-import Text from '../../components/Text';
+import ExpensifyText from '../../components/ExpensifyText';
import * as BankAccounts from '../../libs/actions/BankAccounts';
import IdentityForm from './IdentityForm';
import * as ValidationUtils from '../../libs/ValidationUtils';
@@ -179,7 +179,7 @@ class RequestorStep extends React.Component {
- {this.props.translate('requestorStep.subtitle')}
+ {this.props.translate('requestorStep.subtitle')}
{`${this.props.translate('requestorStep.learnMore')}`}
- {' | '}
+ {' | '}
(
-
+
{this.props.translate('requestorStep.isControllingOfficer')}
-
+
)}
style={[styles.mt4]}
hasError={Boolean(this.getErrors().isControllingOfficer)}
errorText={this.getErrors().isControllingOfficer ? this.props.translate('requestorStep.isControllingOfficerError') : ''}
/>
-
+
{this.props.translate('requestorStep.onFidoConditions')}
- Link.openExternalLink('https://onfido.com/facial-scan-policy-and-release/')}
style={[styles.textMicro, styles.link]}
accessibilityRole="link"
>
{`${this.props.translate('requestorStep.onFidoFacialScan')}`}
-
+
{', '}
- Link.openExternalLink('https://onfido.com/privacy/')}
style={[styles.textMicro, styles.link]}
accessibilityRole="link"
>
{`${this.props.translate('common.privacyPolicy')}`}
-
+
{` ${this.props.translate('common.and')} `}
- Link.openExternalLink('https://onfido.com/terms-of-service/')}
style={[styles.textMicro, styles.link]}
accessibilityRole="link"
>
{`${this.props.translate('common.termsOfService')}`}
-
-
+
+
)}
>
diff --git a/src/pages/ReimbursementAccount/ValidationStep.js b/src/pages/ReimbursementAccount/ValidationStep.js
index cce782a2ad02..0684324278a3 100644
--- a/src/pages/ReimbursementAccount/ValidationStep.js
+++ b/src/pages/ReimbursementAccount/ValidationStep.js
@@ -11,7 +11,7 @@ import * as Report from '../../libs/actions/Report';
import HeaderWithCloseButton from '../../components/HeaderWithCloseButton';
import Navigation from '../../libs/Navigation/Navigation';
import ExpensiTextInput from '../../components/ExpensiTextInput';
-import Text from '../../components/Text';
+import ExpensifyText from '../../components/ExpensifyText';
import BankAccount from '../../libs/models/BankAccount';
import TextLink from '../../components/TextLink';
import ONYXKEYS from '../../ONYXKEYS';
@@ -172,7 +172,7 @@ class ValidationStep extends React.Component {
/>
{maxAttemptsReached && (
-
+
{this.props.translate('validationStep.maxAttemptsReached')}
{' '}
{this.props.translate('common.please')}
@@ -181,7 +181,7 @@ class ValidationStep extends React.Component {
{this.props.translate('common.contactUs')}
.
-
+
)}
{!maxAttemptsReached && state === BankAccount.STATE.PENDING && (
@@ -189,12 +189,12 @@ class ValidationStep extends React.Component {
onSubmit={this.submit}
>
-
+
{this.props.translate('validationStep.description')}
-
-
+
+
{this.props.translate('validationStep.descriptionCTA')}
-
+
-
+
{this.props.translate('validationStep.letsChatText')}
-
+
)}
diff --git a/src/pages/ReportDetailsPage.js b/src/pages/ReportDetailsPage.js
index 8794b687646e..3c794698c881 100644
--- a/src/pages/ReportDetailsPage.js
+++ b/src/pages/ReportDetailsPage.js
@@ -22,7 +22,7 @@ import * as Report from '../libs/actions/Report';
import * as Expensicons from '../components/Icon/Expensicons';
import ROUTES from '../ROUTES';
import MenuItem from '../components/MenuItem';
-import Text from '../components/Text';
+import ExpensifyText from '../components/ExpensifyText';
import ExpensiPicker from '../components/ExpensiPicker';
const propTypes = {
@@ -144,7 +144,7 @@ class ReportDetailsPage extends Component {
textStyles={[styles.headerText, styles.mb2]}
shouldUseFullTitle={ReportUtils.isDefaultRoom(this.props.report)}
/>
-
{defaultRoomSubtitle}
-
+
{!ReportUtils.isArchivedRoom(this.props.report) && (
-
+
{this.props.translate('common.notifications')}
-
+
diff --git a/src/pages/RequestCallPage.js b/src/pages/RequestCallPage.js
index 56ae6597f9a8..2370d28ec505 100644
--- a/src/pages/RequestCallPage.js
+++ b/src/pages/RequestCallPage.js
@@ -12,7 +12,7 @@ import withLocalize, {withLocalizePropTypes} from '../components/withLocalize';
import ONYXKEYS from '../ONYXKEYS';
import compose from '../libs/compose';
import FullNameInputRow from '../components/FullNameInputRow';
-import Button from '../components/Button';
+import ExpensifyButton from '../components/ExpensifyButton';
import FixedFooter from '../components/FixedFooter';
import CONST from '../CONST';
import Growl from '../libs/Growl';
@@ -20,7 +20,7 @@ import * as Inbox from '../libs/actions/Inbox';
import * as Report from '../libs/actions/Report';
import personalDetailsPropType from './personalDetailsPropType';
import ExpensiTextInput from '../components/ExpensiTextInput';
-import Text from '../components/Text';
+import ExpensifyText from '../components/ExpensifyText';
import KeyboardAvoidingView from '../components/KeyboardAvoidingView';
import RequestCallIcon from '../../assets/images/request-call.svg';
import * as PersonalDetails from '../libs/actions/PersonalDetails';
@@ -214,12 +214,12 @@ class RequestCallPage extends Component {
/>
- {this.props.translate('requestCallPage.subtitle')}
+ {this.props.translate('requestCallPage.subtitle')}
-
+
{this.props.translate('requestCallPage.description')}
-
+
-
-
{!_.isEmpty(error) && (
-
+
{error}
-
+
)}
diff --git a/src/pages/home/HeaderView.js b/src/pages/home/HeaderView.js
index a370c8885c8c..245e9e6e4267 100644
--- a/src/pages/home/HeaderView.js
+++ b/src/pages/home/HeaderView.js
@@ -24,7 +24,7 @@ import IOUBadge from '../../components/IOUBadge';
import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
import CONST from '../../CONST';
import * as ReportUtils from '../../libs/reportUtils';
-import Text from '../../components/Text';
+import ExpensifyText from '../../components/ExpensifyText';
import Tooltip from '../../components/Tooltip';
const propTypes = {
@@ -148,7 +148,7 @@ const HeaderView = (props) => {
shouldUseFullTitle={isDefaultChatRoom}
/>
{isDefaultChatRoom && (
- {
numberOfLines={1}
>
{subtitle}
-
+
)}
diff --git a/src/pages/home/report/EmojiPickerMenu/index.js b/src/pages/home/report/EmojiPickerMenu/index.js
index 046e27b08c6e..97adc713bf34 100755
--- a/src/pages/home/report/EmojiPickerMenu/index.js
+++ b/src/pages/home/report/EmojiPickerMenu/index.js
@@ -8,7 +8,7 @@ import * as StyleUtils from '../../../../styles/StyleUtils';
import themeColors from '../../../../styles/themes/default';
import emojis from '../../../../../assets/emojis';
import EmojiPickerMenuItem from '../EmojiPickerMenuItem';
-import Text from '../../../../components/Text';
+import ExpensifyText from '../../../../components/ExpensifyText';
import TextInputFocusable from '../../../../components/TextInputFocusable';
import withWindowDimensions, {windowDimensionsPropTypes} from '../../../../components/withWindowDimensions';
import withLocalize, {withLocalizePropTypes} from '../../../../components/withLocalize';
@@ -333,9 +333,9 @@ class EmojiPickerMenu extends Component {
if (header) {
return (
-
+
{code}
-
+
);
}
@@ -377,7 +377,7 @@ class EmojiPickerMenu extends Component {
)}
{this.state.filteredEmojis.length === 0
? (
-
{this.props.translate('common.noResultsFound')}
-
+
)
: (
+
{item.code}
-
+
);
}
diff --git a/src/pages/home/report/EmojiPickerMenuItem.js b/src/pages/home/report/EmojiPickerMenuItem.js
index d2bb719943db..90bab9c7931d 100644
--- a/src/pages/home/report/EmojiPickerMenuItem.js
+++ b/src/pages/home/report/EmojiPickerMenuItem.js
@@ -5,7 +5,7 @@ import styles from '../../../styles/styles';
import * as StyleUtils from '../../../styles/StyleUtils';
import getButtonState from '../../../libs/getButtonState';
import Hoverable from '../../../components/Hoverable';
-import Text from '../../../components/Text';
+import ExpensifyText from '../../../components/ExpensifyText';
const propTypes = {
/** The unicode that is used to display the emoji */
@@ -34,9 +34,9 @@ const EmojiPickerMenuItem = props => (
])}
>
-
+
{props.emoji}
-
+
diff --git a/src/pages/home/report/EmojiSkinToneList.js b/src/pages/home/report/EmojiSkinToneList.js
index c04d3c49c622..6f15aae88d2a 100644
--- a/src/pages/home/report/EmojiSkinToneList.js
+++ b/src/pages/home/report/EmojiSkinToneList.js
@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
import styles from '../../../styles/styles';
import * as Emojis from '../../../../assets/emojis';
import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
-import Text from '../../../components/Text';
+import ExpensifyText from '../../../components/ExpensifyText';
import getSkinToneEmojiFromIndex from './EmojiPickerMenu/getSkinToneEmojiFromIndex';
import EmojiPickerMenuItem from './EmojiPickerMenuItem';
@@ -68,12 +68,12 @@ class EmojiSkinToneList extends Component {
styles.alignItemsCenter,
]}
>
-
+
{selectedEmoji.code}
-
-
+
+
{this.props.translate('emojiPicker.skinTonePickerLabel')}
-
+
)
}
diff --git a/src/pages/home/report/MarkerBadge/index.js b/src/pages/home/report/MarkerBadge/index.js
index 07eb5179751e..2ffaa61ed4bd 100644
--- a/src/pages/home/report/MarkerBadge/index.js
+++ b/src/pages/home/report/MarkerBadge/index.js
@@ -2,7 +2,7 @@ import React, {PureComponent} from 'react';
import {Animated, Text, View} from 'react-native';
import PropTypes from 'prop-types';
import styles from '../../../../styles/styles';
-import Button from '../../../../components/Button';
+import ExpensifyButton from '../../../../components/ExpensifyButton';
import Icon from '../../../../components/Icon';
import * as Expensicons from '../../../../components/Icon/Expensicons';
import themeColors from '../../../../styles/themes/default';
@@ -77,7 +77,7 @@ class MarkerBadge extends PureComponent {
styles.alignItemsCenter,
]}
>
-
-
-
+
);
}
diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index 2a2359615d85..1e090239f525 100755
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -41,7 +41,7 @@ import * as User from '../../../libs/actions/User';
import reportActionPropTypes from './reportActionPropTypes';
import * as ReportUtils from '../../../libs/reportUtils';
import ReportActionComposeFocusManager from '../../../libs/ReportActionComposeFocusManager';
-import Text from '../../../components/Text';
+import ExpensifyText from '../../../components/ExpensifyText';
import {participantPropTypes} from '../sidebar/optionPropTypes';
import currentUserPersonalDetailsPropsTypes from '../../settings/Profile/currentUserPersonalDetailsPropsTypes';
import ParticipantLocalTime from './ParticipantLocalTime';
@@ -717,9 +717,9 @@ class ReportActionCompose extends React.Component {
width={variables.iconSizeExtraSmall}
height={variables.iconSizeExtraSmall}
/>
-
+
{this.props.translate('reportActionCompose.youAppearToBeOffline')}
-
+
) : }
diff --git a/src/pages/home/report/ReportActionItemDate.js b/src/pages/home/report/ReportActionItemDate.js
index 8ee127a721fd..fadfd98debb6 100644
--- a/src/pages/home/report/ReportActionItemDate.js
+++ b/src/pages/home/report/ReportActionItemDate.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import styles from '../../../styles/styles';
import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
import compose from '../../../libs/compose';
-import Text from '../../../components/Text';
+import ExpensifyText from '../../../components/ExpensifyText';
import {withCurrentDate} from '../../../components/OnyxProvider';
const propTypes = {
@@ -13,9 +13,9 @@ const propTypes = {
};
const ReportActionItemDate = props => (
-
+
{props.timestampToDateTime(props.timestamp)}
-
+
);
ReportActionItemDate.propTypes = propTypes;
diff --git a/src/pages/home/report/ReportActionItemFragment.js b/src/pages/home/report/ReportActionItemFragment.js
index 5088a773a48e..e39fe850107f 100644
--- a/src/pages/home/report/ReportActionItemFragment.js
+++ b/src/pages/home/report/ReportActionItemFragment.js
@@ -7,7 +7,7 @@ import styles from '../../../styles/styles';
import variables from '../../../styles/variables';
import themeColors from '../../../styles/themes/default';
import RenderHTML from '../../../components/RenderHTML';
-import Text from '../../../components/Text';
+import ExpensifyText from '../../../components/ExpensifyText';
import Tooltip from '../../../components/Tooltip';
import * as EmojiUtils from '../../../libs/EmojiUtils';
import withWindowDimensions, {windowDimensionsPropTypes} from '../../../components/withWindowDimensions';
@@ -68,51 +68,51 @@ class ReportActionItemFragment extends React.PureComponent {
html={`${this.props.fragment.html + (this.props.fragment.isEdited ? '' : '')}`}
/>
) : (
-
{Str.htmlDecode(this.props.fragment.text)}
{this.props.fragment.isEdited && (
-
- {/* Native devices do not support margin between nested text */}
- {' '}
+ {/* Native devices do not support margin between nested ExpensifyText */}
+ {' '}
{this.props.translate('reportActionCompose.edited')}
-
+
)}
-
+
);
case 'TEXT':
return (
-
{Str.htmlDecode(this.props.fragment.text)}
-
+
);
case 'LINK':
- return LINK;
+ return LINK;
case 'INTEGRATION_COMMENT':
- return REPORT_LINK;
+ return REPORT_LINK;
case 'REPORT_LINK':
- return REPORT_LINK;
+ return REPORT_LINK;
case 'POLICY_LINK':
- return POLICY_LINK;
+ return POLICY_LINK;
// If we have a message fragment type of OLD_MESSAGE this means we have not yet converted this over to the
// new data structure. So we simply set this message as inner html and render it like we did before.
// This wil allow us to convert messages over to the new structure without needing to do it all at once.
case 'OLD_MESSAGE':
- return OLD_MESSAGE;
+ return OLD_MESSAGE;
default:
- return fragment.text;
+ return fragment.text;
}
}
}
diff --git a/src/pages/home/report/ReportActionItemMessageEdit.js b/src/pages/home/report/ReportActionItemMessageEdit.js
index dd18d89fccc0..cf4c243cfbb7 100644
--- a/src/pages/home/report/ReportActionItemMessageEdit.js
+++ b/src/pages/home/report/ReportActionItemMessageEdit.js
@@ -11,7 +11,7 @@ import * as ReportScrollManager from '../../../libs/ReportScrollManager';
import toggleReportActionComposeView from '../../../libs/toggleReportActionComposeView';
import withWindowDimensions, {windowDimensionsPropTypes} from '../../../components/withWindowDimensions';
import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
-import Button from '../../../components/Button';
+import ExpensifyButton from '../../../components/ExpensifyButton';
import ReportActionComposeFocusManager from '../../../libs/ReportActionComposeFocusManager';
import compose from '../../../libs/compose';
@@ -163,13 +163,13 @@ class ReportActionItemMessageEdit extends React.Component {
/>
-
- ;
@@ -54,24 +54,24 @@ class ReportTypingIndicator extends React.Component {
return (
-
{PersonalDetails.getDisplayName(this.state.usersTyping[0])}
-
+
-
+
{` ${this.props.translate('reportTypingIndicator.isTyping')}`}
-
+
);
default:
return (
-
{this.props.translate('reportTypingIndicator.multipleUsers')}
{` ${this.props.translate('reportTypingIndicator.areTyping')}`}
-
+
);
}
diff --git a/src/pages/home/sidebar/OptionRow.js b/src/pages/home/sidebar/OptionRow.js
index 2c58924d8732..26cc11c936fa 100644
--- a/src/pages/home/sidebar/OptionRow.js
+++ b/src/pages/home/sidebar/OptionRow.js
@@ -20,7 +20,7 @@ import DisplayNames from '../../../components/DisplayNames';
import IOUBadge from '../../../components/IOUBadge';
import colors from '../../../styles/colors';
import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
-import Text from '../../../components/Text';
+import ExpensifyText from '../../../components/ExpensifyText';
const propTypes = {
/** Background Color of the Option Row */
@@ -188,19 +188,19 @@ const OptionRow = (props) => {
shouldUseFullTitle={props.option.isDefaultChatRoom}
/>
{props.option.alternateText ? (
-
{props.option.alternateText}
-
+
) : null}
{props.option.descriptiveText ? (
-
+
{props.option.descriptiveText}
-
+
) : null}
{props.showSelectedState && (
diff --git a/src/pages/iou/IOUCurrencySelection.js b/src/pages/iou/IOUCurrencySelection.js
index 3adfeba4a99d..d2a85cc4ea8a 100644
--- a/src/pages/iou/IOUCurrencySelection.js
+++ b/src/pages/iou/IOUCurrencySelection.js
@@ -7,7 +7,7 @@ import styles from '../../styles/styles';
import * as PersonalDetails from '../../libs/actions/PersonalDetails';
import ONYXKEYS from '../../ONYXKEYS';
import * as OptionsListUtils from '../../libs/OptionsListUtils';
-import Text from '../../components/Text';
+import ExpensifyText from '../../components/ExpensifyText';
import OptionRow from '../home/sidebar/OptionRow';
import themeColors from '../../styles/themes/default';
import TextInputWithFocusStyles from '../../components/TextInputWithFocusStyles';
@@ -18,7 +18,7 @@ import compose from '../../libs/compose';
import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
import CONST from '../../CONST';
import KeyboardAvoidingView from '../../components/KeyboardAvoidingView';
-import Button from '../../components/Button';
+import ExpensifyButton from '../../components/ExpensifyButton';
import FixedFooter from '../../components/FixedFooter';
import * as IOU from '../../libs/actions/IOU';
@@ -208,9 +208,9 @@ class IOUCurrencySelection extends Component {
)}
renderSectionHeader={({section: {title}}) => (
-
+
{title}
-
+
)}
/>
@@ -218,7 +218,7 @@ class IOUCurrencySelection extends Component {
-
) : (
-
-
+
{lodashGet(this.props.currencyList, [this.props.iou.selectedCurrencyCode, 'symbol'])}
-
+
{this.props.isSmallScreenWidth
? (
-
{this.state.amount}
-
+
) : (
) : }
- this.props.onStepComplete(this.state.amount)}
diff --git a/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsSplit.js b/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsSplit.js
index 46c048e819a6..e6fea431bc0a 100755
--- a/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsSplit.js
+++ b/src/pages/iou/steps/IOUParticipantsPage/IOUParticipantsSplit.js
@@ -11,8 +11,8 @@ import * as OptionsListUtils from '../../../../libs/OptionsListUtils';
import CONST from '../../../../CONST';
import withLocalize, {withLocalizePropTypes} from '../../../../components/withLocalize';
import compose from '../../../../libs/compose';
-import Button from '../../../../components/Button';
-import Text from '../../../../components/Text';
+import ExpensifyButton from '../../../../components/ExpensifyButton';
+import ExpensifyText from '../../../../components/ExpensifyText';
import FixedFooter from '../../../../components/FixedFooter';
import personalDetailsPropType from '../../../personalDetailsPropType';
@@ -196,9 +196,9 @@ class IOUParticipantsSplit extends Component {
return (
<>
-
+
{this.props.translate('common.to')}
-
+
0 && (
{maxParticipantsReached && (
-
+
{this.props.translate('iou.maxParticipantsReached', {count: CONST.REPORT.MAXIMUM_PARTICIPANTS})}
-
+
)}
- {
- {
>
v
{version}
-
-
+
+
{props.translate('initialSettingsPage.aboutPage.description')}
-
+
{_.map(menuItems, item => (
@@ -100,7 +100,7 @@ const AboutPage = (props) => {
))}
-
@@ -108,29 +108,29 @@ const AboutPage = (props) => {
'initialSettingsPage.readTheTermsAndPrivacyPolicy.phrase1',
)}
{' '}
- Link.openExternalLink(CONST.TERMS_URL)}
>
{props.translate(
'initialSettingsPage.readTheTermsAndPrivacyPolicy.phrase2',
)}
-
+
{' '}
{props.translate(
'initialSettingsPage.readTheTermsAndPrivacyPolicy.phrase3',
)}
{' '}
- Link.openExternalLink(CONST.PRIVACY_URL)}
>
{props.translate(
'initialSettingsPage.readTheTermsAndPrivacyPolicy.phrase4',
)}
-
+
.
-
+
diff --git a/src/pages/settings/AddSecondaryLoginPage.js b/src/pages/settings/AddSecondaryLoginPage.js
index 98d7573ee44b..541449b0e994 100755
--- a/src/pages/settings/AddSecondaryLoginPage.js
+++ b/src/pages/settings/AddSecondaryLoginPage.js
@@ -7,11 +7,11 @@ import Str from 'expensify-common/lib/str';
import HeaderWithCloseButton from '../../components/HeaderWithCloseButton';
import Navigation from '../../libs/Navigation/Navigation';
import ScreenWrapper from '../../components/ScreenWrapper';
-import Text from '../../components/Text';
+import ExpensifyText from '../../components/ExpensifyText';
import styles from '../../styles/styles';
import * as User from '../../libs/actions/User';
import ONYXKEYS from '../../ONYXKEYS';
-import Button from '../../components/Button';
+import ExpensifyButton from '../../components/ExpensifyButton';
import ROUTES from '../../ROUTES';
import CONST from '../../CONST';
import KeyboardAvoidingView from '../../components/KeyboardAvoidingView';
@@ -111,11 +111,11 @@ class AddSecondaryLoginPage extends Component {
onCloseButtonPress={() => Navigation.dismissModal()}
/>
-
+
{this.props.translate(this.formType === CONST.LOGIN_TYPE.PHONE
? 'addSecondaryLoginPage.enterPreferredPhoneNumberToSendValidationLink'
: 'addSecondaryLoginPage.enterPreferredEmailToSendValidationLink')}
-
+
{!_.isEmpty(this.props.user.error) && (
-
+
{this.props.user.error}
-
+
)}
- {
-
+
{props.myPersonalDetails.displayName
? props.myPersonalDetails.displayName
: Str.removeSMSDomain(props.session.email)}
-
+
{props.myPersonalDetails.displayName && (
-
{Str.removeSMSDomain(props.session.email)}
-
+
)}
{_.map(menuItems, (item, index) => {
diff --git a/src/pages/settings/NewPasswordForm.js b/src/pages/settings/NewPasswordForm.js
index d25be20f6192..ec586223f28d 100644
--- a/src/pages/settings/NewPasswordForm.js
+++ b/src/pages/settings/NewPasswordForm.js
@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import {View} from 'react-native';
-import Text from '../../components/Text';
+import ExpensifyText from '../../components/ExpensifyText';
import withLocalize, {
withLocalizePropTypes,
} from '../../components/withLocalize';
@@ -103,7 +103,7 @@ class NewPasswordForm extends React.Component {
onChangeText={password => this.props.updatePassword(password)}
onBlur={() => this.onBlurNewPassword()}
/>
-
{this.props.translate('setPasswordPage.newPasswordPrompt')}
-
+
Navigation.dismissModal(true)}
/>
-
+
{this.props.translate('passwordPage.changingYourPasswordPrompt')}
-
+
{this.props.translate('passwordPage.newPasswordPrompt')}
-
+
)
}
@@ -228,13 +228,13 @@ class PasswordPage extends Component {
/>
{_.every(this.state.errors, error => !error) && !_.isEmpty(this.props.account.error) && (
-
+
{this.props.account.error}
-
+
)}
- (
<>
- {`${this.props.translate('common.iAcceptThe')}`}
+ {`${this.props.translate('common.iAcceptThe')}`}
{`${this.props.translate('addDebitCardPage.expensifyTermsOfService')}`}
@@ -255,9 +255,9 @@ class DebitCardPage extends Component {
{!_.isEmpty(this.props.addDebitCardForm.error) && (
-
+
{this.props.addDebitCardForm.error}
-
+
)}
-
+
{this.props.translate('addPayPalMePage.enterYourUsernameToGetPaidViaPayPal')}
-
+
-
}
-
{this.props.translate('paymentsPage.paymentMethodsTitle')}
-
+
{
/>
-
+
{props.translate('common.notifications')}
-
+
-
+
{props.translate('preferencesPage.receiveRelevantFeatureUpdatesAndExpensifyNews')}
-
+
{
value={props.priorityMode}
/>
-
+
{priorityModes[props.priorityMode].description}
-
+
@@ -103,14 +103,14 @@ const PreferencesPage = (props) => {
{/* and internal testers to take advantage of sandbox environments for 3rd party services like Plaid and Onfido */}
{props.environment === CONST.ENVIRONMENT.STAGING && (
<>
-
+
Test Preferences
-
+
-
+
Use Secure Staging Server
-
+
- {this.props.label}
+ {this.props.label}
{!this.props.login.partnerUserID ? (
);
diff --git a/src/pages/settings/Profile/ProfilePage.js b/src/pages/settings/Profile/ProfilePage.js
index 85294fae504a..f71fc8231c9c 100755
--- a/src/pages/settings/Profile/ProfilePage.js
+++ b/src/pages/settings/Profile/ProfilePage.js
@@ -14,11 +14,11 @@ import ROUTES from '../../../ROUTES';
import ONYXKEYS from '../../../ONYXKEYS';
import CONST from '../../../CONST';
import styles from '../../../styles/styles';
-import Text from '../../../components/Text';
+import ExpensifyText from '../../../components/ExpensifyText';
import LoginField from './LoginField';
import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
import compose from '../../../libs/compose';
-import Button from '../../../components/Button';
+import ExpensifyButton from '../../../components/ExpensifyButton';
import KeyboardAvoidingView from '../../../components/KeyboardAvoidingView';
import FixedFooter from '../../../components/FixedFooter';
import ExpensiTextInput from '../../../components/ExpensiTextInput';
@@ -206,9 +206,9 @@ class ProfilePage extends Component {
anchorPosition={styles.createMenuPositionProfile}
size={CONST.AVATAR_SIZE.LARGE}
/>
-
+
{this.props.translate('profilePage.tellUsAboutYourself')}
-
+
- (
-
+
{props.translate('common.not')}
{Str.isSMSLogin(props.credentials.login)
? props.toLocalPhone(Str.removeSMSDomain(props.credentials.login))
: Str.removeSMSDomain(props.credentials.login)}
{'? '}
-
+
-
+
{props.translate('common.goBack')}
{'.'}
-
+
);
diff --git a/src/pages/signin/LoginForm.js b/src/pages/signin/LoginForm.js
index c791b556575b..3bc86d52a397 100755
--- a/src/pages/signin/LoginForm.js
+++ b/src/pages/signin/LoginForm.js
@@ -5,8 +5,8 @@ import PropTypes from 'prop-types';
import _ from 'underscore';
import Str from 'expensify-common/lib/str';
import styles from '../../styles/styles';
-import Button from '../../components/Button';
-import Text from '../../components/Text';
+import ExpensifyButton from '../../components/ExpensifyButton';
+import ExpensifyText from '../../components/ExpensifyText';
import * as Session from '../../libs/actions/Session';
import ONYXKEYS from '../../ONYXKEYS';
import withWindowDimensions, {windowDimensionsPropTypes} from '../../components/withWindowDimensions';
@@ -118,23 +118,23 @@ class LoginForm extends React.Component {
/>
{this.state.formError && (
-
+
{this.props.translate(this.state.formError)}
-
+
)}
{!this.state.formError && !_.isEmpty(this.props.account.error) && (
-
+
{this.props.account.error}
-
+
)}
{!_.isEmpty(this.props.account.success) && (
-
+
{this.props.account.success}
-
+
)}
-
-
+
{this.props.translate('passwordForm.forgot')}
-
+
@@ -122,18 +122,18 @@ class PasswordForm extends React.Component {
)}
{!this.state.formError && this.props.account && !_.isEmpty(this.props.account.error) && (
-
+
{this.props.account.error}
-
+
)}
{this.state.formError && (
-
+
{this.props.translate(this.state.formError)}
-
+
)}
-
-
+
{login}
-
+
-
+
{message}
-
+
{!_.isEmpty(this.state.formSuccess) && (
-
+
{this.state.formSuccess}
-
+
)}
redirectToSignIn()}>
-
+
{this.props.translate('common.back')}
-
+
- (
/>
{props.shouldShowWelcomeText && (
-
+
{props.welcomeText}
-
+
)}
{props.children}
diff --git a/src/pages/signin/SignInPageLayout/SignInPageLayoutWide.js b/src/pages/signin/SignInPageLayout/SignInPageLayoutWide.js
index 065fb892a415..ee6287cec9d8 100755
--- a/src/pages/signin/SignInPageLayout/SignInPageLayoutWide.js
+++ b/src/pages/signin/SignInPageLayout/SignInPageLayoutWide.js
@@ -5,7 +5,7 @@ import SVGImage from '../../../components/SVGImage';
import styles from '../../../styles/styles';
import * as StyleUtils from '../../../styles/StyleUtils';
import ExpensifyCashLogo from '../../../components/ExpensifyCashLogo';
-import Text from '../../../components/Text';
+import ExpensifyText from '../../../components/ExpensifyText';
import variables from '../../../styles/variables';
import TermsAndLicenses from '../TermsAndLicenses';
import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
@@ -50,9 +50,9 @@ const SignInPageLayoutWide = props => (
/>
{props.shouldShowWelcomeText && (
-
+
{props.welcomeText}
-
+
)}
{props.children}
diff --git a/src/pages/signin/TermsAndLicenses.js b/src/pages/signin/TermsAndLicenses.js
index 56909935af64..4ce8d694628a 100644
--- a/src/pages/signin/TermsAndLicenses.js
+++ b/src/pages/signin/TermsAndLicenses.js
@@ -2,7 +2,7 @@ import React from 'react';
import {View} from 'react-native';
import styles from '../../styles/styles';
import CONST from '../../CONST';
-import Text from '../../components/Text';
+import ExpensifyText from '../../components/ExpensifyText';
import TextLink from '../../components/TextLink';
import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
import LogoWordmark from '../../../assets/images/expensify-wordmark.svg';
@@ -19,9 +19,9 @@ const TermsAndLicenses = props => (
styles.alignItemsCenter,
]}
>
-
+
{props.translate('termsOfUse.phrase1')}
-
+
(
{props.translate('termsOfUse.phrase2')}
{' '}
-
+
{props.translate('termsOfUse.phrase3')}
-
+
(
{' '}
{props.translate('termsOfUse.phrase4')}
- .
-
+ .
+
{props.translate('termsOfUse.phrase5')}
{' '}
-
-
+
+
{props.translate('termsOfUse.phrase6')}
-
+
(
{' '}
{props.translate('termsOfUse.phrase7')}
- .
+ .
diff --git a/src/pages/workspace/WorkspaceBankAccountPage.js b/src/pages/workspace/WorkspaceBankAccountPage.js
index 09d4165c49fd..67ed050f504a 100644
--- a/src/pages/workspace/WorkspaceBankAccountPage.js
+++ b/src/pages/workspace/WorkspaceBankAccountPage.js
@@ -3,7 +3,7 @@ import React from 'react';
import {withOnyx} from 'react-native-onyx';
import * as Expensicons from '../../components/Icon/Expensicons';
import * as Illustrations from '../../components/Icon/Illustrations';
-import Text from '../../components/Text';
+import ExpensifyText from '../../components/ExpensifyText';
import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
import * as BankAccounts from '../../libs/actions/BankAccounts';
import compose from '../../libs/compose';
@@ -109,9 +109,9 @@ class WorkspaceBankAccountPage extends React.Component {
},
]}
>
-
+
{this.props.translate('workspace.bankAccount.youreAlmostDone')}
-
+
>
diff --git a/src/pages/workspace/WorkspaceInitialPage.js b/src/pages/workspace/WorkspaceInitialPage.js
index ffd04c654b7f..61b6da052a1b 100644
--- a/src/pages/workspace/WorkspaceInitialPage.js
+++ b/src/pages/workspace/WorkspaceInitialPage.js
@@ -6,7 +6,6 @@ import {withNavigationFocus} from '@react-navigation/compat';
import Navigation from '../../libs/Navigation/Navigation';
import ROUTES from '../../ROUTES';
import styles from '../../styles/styles';
-import Text from '../../components/Text';
import Tooltip from '../../components/Tooltip';
import ConfirmModal from '../../components/ConfirmModal';
import Icon from '../../components/Icon';
diff --git a/src/pages/workspace/WorkspaceInvitePage.js b/src/pages/workspace/WorkspaceInvitePage.js
index 684ba734c76e..adc1cc7e985e 100644
--- a/src/pages/workspace/WorkspaceInvitePage.js
+++ b/src/pages/workspace/WorkspaceInvitePage.js
@@ -20,7 +20,7 @@ import * as OptionsListUtils from '../../libs/OptionsListUtils';
import CONST from '../../CONST';
import FullScreenLoadingIndicator from '../../components/FullscreenLoadingIndicator';
import * as Link from '../../libs/actions/Link';
-import Text from '../../components/Text';
+import ExpensifyText from '../../components/ExpensifyText';
import withFullPolicy, {fullPolicyPropTypes, fullPolicyDefaultProps} from './withFullPolicy';
const personalDetailsPropTypes = PropTypes.shape({
@@ -320,11 +320,11 @@ class WorkspaceInvitePage extends React.Component {
>
{({hovered, pressed}) => (
-
{this.props.translate('common.privacyPolicy')}
-
+
)}
diff --git a/src/pages/workspace/WorkspaceMembersPage.js b/src/pages/workspace/WorkspaceMembersPage.js
index 6b90b4077561..f147d92aaced 100644
--- a/src/pages/workspace/WorkspaceMembersPage.js
+++ b/src/pages/workspace/WorkspaceMembersPage.js
@@ -16,9 +16,9 @@ import ScreenWrapper from '../../components/ScreenWrapper';
import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
import compose from '../../libs/compose';
import * as Policy from '../../libs/actions/Policy';
-import Button from '../../components/Button';
+import ExpensifyButton from '../../components/ExpensifyButton';
import Checkbox from '../../components/Checkbox';
-import Text from '../../components/Text';
+import ExpensifyText from '../../components/ExpensifyText';
import ROUTES from '../../ROUTES';
import ConfirmModal from '../../components/ConfirmModal';
import personalDetailsPropType from '../personalDetailsPropType';
@@ -227,9 +227,9 @@ class WorkspaceMembersPage extends React.Component {
{this.props.session.email === item.login && (
-
+
{this.props.translate('common.admin')}
-
+
)}
@@ -272,13 +272,13 @@ class WorkspaceMembersPage extends React.Component {
/>
-
-
-
+
{this.props.translate('workspace.people.selectAll')}
-
+
{
confirmText={isInOpenState ? props.translate('workspace.bankAccount.yesDisconnectMyBankAccount') : props.translate('workspace.bankAccount.yesStartOver')}
cancelText={props.translate('common.cancel')}
prompt={isInOpenState ? (
-
- {props.translate('workspace.bankAccount.disconnectYour')}
-
+
+ {props.translate('workspace.bankAccount.disconnectYour')}
+
{bankShortName}
-
- {props.translate('workspace.bankAccount.bankAccountAnyTransactions')}
-
+
+ {props.translate('workspace.bankAccount.bankAccountAnyTransactions')}
+
) : props.translate('workspace.bankAccount.clearProgress')}
danger
onCancel={BankAccounts.cancelResetFreePlanBankAccount}
diff --git a/src/pages/workspace/WorkspaceSection.js b/src/pages/workspace/WorkspaceSection.js
index 1a7142bbc538..ebf69602d20f 100644
--- a/src/pages/workspace/WorkspaceSection.js
+++ b/src/pages/workspace/WorkspaceSection.js
@@ -1,7 +1,7 @@
import React from 'react';
import {View} from 'react-native';
import PropTypes from 'prop-types';
-import Text from '../../components/Text';
+import ExpensifyText from '../../components/ExpensifyText';
import styles from '../../styles/styles';
import MenuItemList from '../../components/MenuItemList';
import Icon from '../../components/Icon';
@@ -38,7 +38,7 @@ const WorkspaceSection = (props) => {
- {props.title}
+ {props.title}
{props.icon && }
diff --git a/src/pages/workspace/WorkspaceSettingsPage.js b/src/pages/workspace/WorkspaceSettingsPage.js
index e0873f2631ee..74b424d010d5 100644
--- a/src/pages/workspace/WorkspaceSettingsPage.js
+++ b/src/pages/workspace/WorkspaceSettingsPage.js
@@ -9,8 +9,8 @@ import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize
import Navigation from '../../libs/Navigation/Navigation';
import Permissions from '../../libs/Permissions';
import styles from '../../styles/styles';
-import Button from '../../components/Button';
-import Text from '../../components/Text';
+import ExpensifyButton from '../../components/ExpensifyButton';
+import ExpensifyText from '../../components/ExpensifyText';
import compose from '../../libs/compose';
import * as Policy from '../../libs/actions/Policy';
import Icon from '../../components/Icon';
@@ -124,7 +124,7 @@ class WorkspaceSettingsPage extends React.Component {
route={this.props.route}
footer={(
-
-
+
{this.props.translate('workspace.editor.currencyInputHelpText')}
-
+
)}
diff --git a/src/pages/workspace/bills/WorkspaceBillsFirstSection.js b/src/pages/workspace/bills/WorkspaceBillsFirstSection.js
index 9ce1576f70c3..0d9365183aa5 100644
--- a/src/pages/workspace/bills/WorkspaceBillsFirstSection.js
+++ b/src/pages/workspace/bills/WorkspaceBillsFirstSection.js
@@ -3,7 +3,7 @@ import {View, TouchableOpacity} from 'react-native';
import PropTypes from 'prop-types';
import {withOnyx} from 'react-native-onyx';
import Str from 'expensify-common/lib/str';
-import Text from '../../../components/Text';
+import ExpensifyText from '../../../components/ExpensifyText';
import styles from '../../../styles/styles';
import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
import * as Expensicons from '../../../components/Icon/Expensicons';
@@ -51,13 +51,13 @@ const WorkspaceBillsFirstSection = (props) => {
]}
>
-
+
{props.translate('workspace.bills.askYourVendorsBeforeEmail')}
{props.user.isFromPublicDomain ? (
Link.openExternalLink('https://community.expensify.com/discussion/7500/how-to-pay-your-company-bills-in-expensify/')}
>
- example.com@expensify.cash
+ example.com@expensify.cash
) : (
{
textStyles={[styles.textBlue]}
/>
)}
- {props.translate('workspace.bills.askYourVendorsAfterEmail')}
-
+ {props.translate('workspace.bills.askYourVendorsAfterEmail')}
+
);
diff --git a/src/pages/workspace/bills/WorkspaceBillsNoVBAView.js b/src/pages/workspace/bills/WorkspaceBillsNoVBAView.js
index d28201dfc52b..40f376b0b5bf 100644
--- a/src/pages/workspace/bills/WorkspaceBillsNoVBAView.js
+++ b/src/pages/workspace/bills/WorkspaceBillsNoVBAView.js
@@ -1,7 +1,7 @@
import React from 'react';
import {View} from 'react-native';
import PropTypes from 'prop-types';
-import Text from '../../../components/Text';
+import ExpensifyText from '../../../components/ExpensifyText';
import styles from '../../../styles/styles';
import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
import * as Expensicons from '../../../components/Icon/Expensicons';
@@ -36,7 +36,7 @@ const WorkspaceBillsNoVBAView = props => (
]}
>
- {props.translate('workspace.bills.unlockNoVBACopy')}
+ {props.translate('workspace.bills.unlockNoVBACopy')}
>
diff --git a/src/pages/workspace/bills/WorkspaceBillsVBAView.js b/src/pages/workspace/bills/WorkspaceBillsVBAView.js
index abac76302b72..a61ff010baf4 100644
--- a/src/pages/workspace/bills/WorkspaceBillsVBAView.js
+++ b/src/pages/workspace/bills/WorkspaceBillsVBAView.js
@@ -1,7 +1,7 @@
import React from 'react';
import {View} from 'react-native';
import PropTypes from 'prop-types';
-import Text from '../../../components/Text';
+import ExpensifyText from '../../../components/ExpensifyText';
import styles from '../../../styles/styles';
import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
import * as Expensicons from '../../../components/Icon/Expensicons';
@@ -35,7 +35,7 @@ const WorkspaceBillsVBAView = props => (
]}
>
- {props.translate('workspace.bills.VBACopy')}
+ {props.translate('workspace.bills.VBACopy')}
>
diff --git a/src/pages/workspace/card/WorkspaceCardNoVBAView.js b/src/pages/workspace/card/WorkspaceCardNoVBAView.js
index 4e455848a96d..80dbcd39851d 100644
--- a/src/pages/workspace/card/WorkspaceCardNoVBAView.js
+++ b/src/pages/workspace/card/WorkspaceCardNoVBAView.js
@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import {View} from 'react-native';
-import Text from '../../../components/Text';
+import ExpensifyText from '../../../components/ExpensifyText';
import styles from '../../../styles/styles';
import Navigation from '../../../libs/Navigation/Navigation';
import ROUTES from '../../../ROUTES';
@@ -32,7 +32,7 @@ const WorkspaceCardNoVBAView = props => (
]}
>
- {props.translate('workspace.card.noVBACopy')}
+ {props.translate('workspace.card.noVBACopy')}
(
/>
{props.user.isCheckingDomain && (
-
+
{props.translate('workspace.card.checkingDomain')}
-
+
)}
>
);
diff --git a/src/pages/workspace/card/WorkspaceCardVBAWithECardView.js b/src/pages/workspace/card/WorkspaceCardVBAWithECardView.js
index fba1927c8cdd..8ab2cfd0a321 100644
--- a/src/pages/workspace/card/WorkspaceCardVBAWithECardView.js
+++ b/src/pages/workspace/card/WorkspaceCardVBAWithECardView.js
@@ -1,6 +1,6 @@
import React from 'react';
import {View} from 'react-native';
-import Text from '../../../components/Text';
+import ExpensifyText from '../../../components/ExpensifyText';
import styles from '../../../styles/styles';
import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
import * as Expensicons from '../../../components/Icon/Expensicons';
@@ -35,7 +35,7 @@ const WorkspaceCardVBAWithECardView = props => (
]}
>
- {props.translate('workspace.card.VBAWithECardCopy')}
+ {props.translate('workspace.card.VBAWithECardCopy')}
(
]}
>
-
+
{props.translate('workspace.invoices.invoiceFirstSectionCopy')}
-
+
);
diff --git a/src/pages/workspace/invoices/WorkspaceInvoicesNoVBAView.js b/src/pages/workspace/invoices/WorkspaceInvoicesNoVBAView.js
index d8c6539acc8e..f0e57f42677c 100644
--- a/src/pages/workspace/invoices/WorkspaceInvoicesNoVBAView.js
+++ b/src/pages/workspace/invoices/WorkspaceInvoicesNoVBAView.js
@@ -1,7 +1,7 @@
import React from 'react';
import {View} from 'react-native';
import PropTypes from 'prop-types';
-import Text from '../../../components/Text';
+import ExpensifyText from '../../../components/ExpensifyText';
import styles from '../../../styles/styles';
import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
import * as Expensicons from '../../../components/Icon/Expensicons';
@@ -36,7 +36,7 @@ const WorkspaceInvoicesNoVBAView = props => (
]}
>
- {props.translate('workspace.invoices.unlockNoVBACopy')}
+ {props.translate('workspace.invoices.unlockNoVBACopy')}
>
diff --git a/src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js b/src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js
index fcc4502853ab..7779a5ad92ea 100644
--- a/src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js
+++ b/src/pages/workspace/invoices/WorkspaceInvoicesVBAView.js
@@ -1,7 +1,7 @@
import React from 'react';
import {View} from 'react-native';
import PropTypes from 'prop-types';
-import Text from '../../../components/Text';
+import ExpensifyText from '../../../components/ExpensifyText';
import styles from '../../../styles/styles';
import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
import * as Expensicons from '../../../components/Icon/Expensicons';
@@ -35,7 +35,7 @@ const WorkspaceInvoicesVBAView = props => (
]}
>
- {props.translate('workspace.invoices.unlockVBACopy')}
+ {props.translate('workspace.invoices.unlockVBACopy')}
>
diff --git a/src/pages/workspace/reimburse/WorkspaceReimburseNoVBAView.js b/src/pages/workspace/reimburse/WorkspaceReimburseNoVBAView.js
index efc467754001..95e58cd36d06 100644
--- a/src/pages/workspace/reimburse/WorkspaceReimburseNoVBAView.js
+++ b/src/pages/workspace/reimburse/WorkspaceReimburseNoVBAView.js
@@ -1,7 +1,7 @@
import React from 'react';
import {View} from 'react-native';
import PropTypes from 'prop-types';
-import Text from '../../../components/Text';
+import ExpensifyText from '../../../components/ExpensifyText';
import styles from '../../../styles/styles';
import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
import * as Expensicons from '../../../components/Icon/Expensicons';
@@ -35,14 +35,14 @@ const WorkspaceReimburseNoVBAView = props => (
]}
>
-
+
{props.translate('workspace.reimburse.captureNoVBACopyBeforeEmail')}
- {props.translate('workspace.reimburse.captureNoVBACopyAfterEmail')}
-
+ {props.translate('workspace.reimburse.captureNoVBACopyAfterEmail')}
+
@@ -59,7 +59,7 @@ const WorkspaceReimburseNoVBAView = props => (
]}
>
- {props.translate('workspace.reimburse.unlockNoVBACopy')}
+ {props.translate('workspace.reimburse.unlockNoVBACopy')}
>
diff --git a/src/pages/workspace/reimburse/WorkspaceReimburseVBAView.js b/src/pages/workspace/reimburse/WorkspaceReimburseVBAView.js
index f16548f9bd94..8bdbea822c54 100644
--- a/src/pages/workspace/reimburse/WorkspaceReimburseVBAView.js
+++ b/src/pages/workspace/reimburse/WorkspaceReimburseVBAView.js
@@ -1,7 +1,7 @@
import React from 'react';
import {View} from 'react-native';
import PropTypes from 'prop-types';
-import Text from '../../../components/Text';
+import ExpensifyText from '../../../components/ExpensifyText';
import styles from '../../../styles/styles';
import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
import * as Expensicons from '../../../components/Icon/Expensicons';
@@ -33,14 +33,14 @@ const WorkspaceReimburseVBAView = props => (
]}
>
-
+
{props.translate('workspace.reimburse.captureNoVBACopyBeforeEmail')}
- {props.translate('workspace.reimburse.captureNoVBACopyAfterEmail')}
-
+ {props.translate('workspace.reimburse.captureNoVBACopyAfterEmail')}
+
@@ -58,7 +58,7 @@ const WorkspaceReimburseVBAView = props => (
]}
>
- {props.translate('workspace.reimburse.fastReimbursementsVBACopy')}
+ {props.translate('workspace.reimburse.fastReimbursementsVBACopy')}
>
diff --git a/src/pages/workspace/travel/WorkspaceTravelNoVBAView.js b/src/pages/workspace/travel/WorkspaceTravelNoVBAView.js
index 149a2a728f6e..22598ff8cfe4 100644
--- a/src/pages/workspace/travel/WorkspaceTravelNoVBAView.js
+++ b/src/pages/workspace/travel/WorkspaceTravelNoVBAView.js
@@ -1,7 +1,7 @@
import React from 'react';
import {View} from 'react-native';
import PropTypes from 'prop-types';
-import Text from '../../../components/Text';
+import ExpensifyText from '../../../components/ExpensifyText';
import styles from '../../../styles/styles';
import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
import * as Expensicons from '../../../components/Icon/Expensicons';
@@ -33,7 +33,7 @@ const WorkspaceTravelNoVBAView = props => (
]}
>
- {props.translate('workspace.travel.noVBACopy')}
+ {props.translate('workspace.travel.noVBACopy')}
>
diff --git a/src/pages/workspace/travel/WorkspaceTravelVBAView.js b/src/pages/workspace/travel/WorkspaceTravelVBAView.js
index c4c97087390d..1b8269b9c1fb 100644
--- a/src/pages/workspace/travel/WorkspaceTravelVBAView.js
+++ b/src/pages/workspace/travel/WorkspaceTravelVBAView.js
@@ -1,6 +1,6 @@
import React from 'react';
import {View} from 'react-native';
-import Text from '../../../components/Text';
+import ExpensifyText from '../../../components/ExpensifyText';
import styles from '../../../styles/styles';
import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
import * as Expensicons from '../../../components/Icon/Expensicons';
@@ -43,7 +43,7 @@ const WorkspaceTravelVBAView = props => (
]}
>
- {props.translate('workspace.travel.VBACopy')}
+ {props.translate('workspace.travel.VBACopy')}
);
diff --git a/src/stories/Button.stories.js b/src/stories/Button.stories.js
index c951ba89c0bf..04e500e91ca3 100644
--- a/src/stories/Button.stories.js
+++ b/src/stories/Button.stories.js
@@ -1,5 +1,5 @@
import React from 'react';
-import Button from '../components/Button';
+import ExpensifyButton from '../components/ExpensifyButton';
/**
* We use the Component Story Format for writing stories. Follow the docs here:
@@ -7,12 +7,12 @@ import Button from '../components/Button';
* https://storybook.js.org/docs/react/writing-stories/introduction#component-story-format
*/
const story = {
- title: 'Components/Button',
- component: Button,
+ title: 'Components/ExpensifyButton',
+ component: ExpensifyButton,
};
// eslint-disable-next-line react/jsx-props-no-spreading
-const Template = args => ;
+const Template = args => ;
// Arguments can be passed to the component by binding
// See: https://storybook.js.org/docs/react/writing-stories/introduction#using-args
diff --git a/src/stories/CheckboxWithLabel.stories.js b/src/stories/CheckboxWithLabel.stories.js
index 8b157a64d067..794ea12633be 100644
--- a/src/stories/CheckboxWithLabel.stories.js
+++ b/src/stories/CheckboxWithLabel.stories.js
@@ -1,6 +1,6 @@
import React from 'react';
import CheckboxWithLabel from '../components/CheckboxWithLabel';
-import Text from '../components/Text';
+import ExpensifyText from '../components/ExpensifyText';
import styles from '../styles/styles';
/**
@@ -32,9 +32,9 @@ WithLabelComponent.args = {
onPress: () => {},
LabelComponent: () => (
<>
- Test
- Test
- Test
+ Test
+ Test
+ Test
>
),
};