diff --git a/src/languages/en.js b/src/languages/en.js
index ab85d453cee5..ab37146fa98a 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -56,6 +56,12 @@ export default {
send: 'Send',
notifications: 'Notifications',
noResultsFound: 'No results found',
+<<<<<<< HEAD
+=======
+ deletedCommentMessage: 'Comment deleted',
+ timePrefix: 'It\'s',
+ conjunctionFor: 'for',
+>>>>>>> 0639c6771 (Merge pull request #4020 from Expensify/Rory-FixUserTypingIndicator)
},
attachmentPicker: {
cameraPermissionRequired: 'Camera Permission Required',
@@ -105,7 +111,6 @@ export default {
blockedFromConcierge: 'Communication is barred',
youAppearToBeOffline: 'You appear to be offline.',
fileUploadFailed: 'Upload Failed. File is not supported.',
- localTime: ({user, time}) => `It's ${time} for ${user}`,
},
reportActionContextMenu: {
copyToClipboard: 'Copy to Clipboard',
diff --git a/src/languages/es.js b/src/languages/es.js
index 31c7df2275d4..b93e1734b820 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -52,6 +52,12 @@ export default {
send: 'Enviar',
notifications: 'Notificaciones',
noResultsFound: 'No se han encontrado resultados',
+<<<<<<< HEAD
+=======
+ deletedCommentMessage: 'Comentario borrado',
+ timePrefix: 'Son las',
+ conjunctionFor: 'para',
+>>>>>>> 0639c6771 (Merge pull request #4020 from Expensify/Rory-FixUserTypingIndicator)
},
attachmentPicker: {
cameraPermissionRequired: 'Se necesita permiso para usar la cámara',
@@ -100,7 +106,6 @@ export default {
writeSomething: 'Escribe algo...',
blockedFromConcierge: 'Comunicación no permitida',
youAppearToBeOffline: 'Parece que estás desconectado.',
- localTime: ({user, time}) => `Son las ${time} para ${user}`,
},
reportActionContextMenu: {
copyToClipboard: 'Copiar al Portapapeles',
diff --git a/src/pages/home/report/ParticipantLocalTime.js b/src/pages/home/report/ParticipantLocalTime.js
index 6876ffeb32c8..595ccb40ae29 100644
--- a/src/pages/home/report/ParticipantLocalTime.js
+++ b/src/pages/home/report/ParticipantLocalTime.js
@@ -58,21 +58,24 @@ class ParticipantLocalTime extends React.Component {
return (
isReportRecipientLocalTimeReady ? (
-
- {this.props.translate(
- 'reportActionCompose.localTime',
- {
- user: reportRecipientDisplayName,
- time: this.state.localTime,
- },
- )}
-
+
+ {this.props.translate('common.timePrefix')}
+
+
+ {this.state.localTime}
+
+
+ {this.props.translate('common.conjunctionFor')}
+
+
+ {reportRecipientDisplayName}
+
+
)
:
diff --git a/src/pages/home/report/ReportTypingIndicator.js b/src/pages/home/report/ReportTypingIndicator.js
index 65d70e39b8b9..d12fdd35d032 100755
--- a/src/pages/home/report/ReportTypingIndicator.js
+++ b/src/pages/home/report/ReportTypingIndicator.js
@@ -59,7 +59,9 @@ class ReportTypingIndicator extends React.Component {
styles.chatItemComposeSecondaryRowOffset,
]}
>
- {getDisplayName(this.state.usersTyping[0])}
+
+ {getDisplayName(this.state.usersTyping[0])}
+
{` ${this.props.translate('reportTypingIndicator.isTyping')}`}
@@ -72,9 +74,13 @@ class ReportTypingIndicator extends React.Component {
styles.chatItemComposeSecondaryRowOffset,
]}
>
- {getDisplayName(this.state.usersTyping[0])}
+
+ {getDisplayName(this.state.usersTyping[0])}
+
{` ${this.props.translate('common.and')} `}
- {getDisplayName(this.state.usersTyping[1])}
+
+ {getDisplayName(this.state.usersTyping[1])}
+
{` ${this.props.translate('reportTypingIndicator.areTyping')}`}
@@ -87,7 +93,7 @@ class ReportTypingIndicator extends React.Component {
styles.chatItemComposeSecondaryRowOffset,
]}
>
-
+
{this.props.translate('reportTypingIndicator.multipleUsers')}
{` ${this.props.translate('reportTypingIndicator.areTyping')}`}
diff --git a/src/styles/styles.js b/src/styles/styles.js
index 209f06362b6d..9388ab02d1d1 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -82,6 +82,14 @@ const styles = {
lineHeight: 14,
},
+ textMicroSupportingBold: {
+ color: themeColors.textSupporting,
+ fontFamily: fontFamily.GTA_BOLD,
+ fontWeight: fontWeightBold,
+ fontSize: variables.fontSizeSmall,
+ lineHeight: 14,
+ },
+
textLarge: {
fontSize: variables.fontSizeLarge,
},