diff --git a/android/app/build.gradle b/android/app/build.gradle
index 1f0aa6f7000c..5cd5ca7ec3cb 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -148,8 +148,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001007702
- versionName "1.0.77-2"
+ versionCode 1001007703
+ versionName "1.0.77-3"
}
splits {
abi {
diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist
index 0df27580c9d9..bf2fea869676 100644
--- a/ios/ExpensifyCash/Info.plist
+++ b/ios/ExpensifyCash/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.0.77.2
+ 1.0.77.3
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist
index ed2dcb34be1f..c0e3487528fa 100644
--- a/ios/ExpensifyCashTests/Info.plist
+++ b/ios/ExpensifyCashTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.0.77.2
+ 1.0.77.3
diff --git a/package-lock.json b/package-lock.json
index cd3c71a535f0..e05bf07c8dbe 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "expensify.cash",
- "version": "1.0.77-2",
+ "version": "1.0.77-3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index d56fd5e6ca6a..5ec3d8129194 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "expensify.cash",
- "version": "1.0.77-2",
+ "version": "1.0.77-3",
"author": "Expensify, Inc.",
"homepage": "https://expensify.cash",
"description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
diff --git a/src/languages/en.js b/src/languages/en.js
index ab85d453cee5..62e6955791d7 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -56,6 +56,9 @@ export default {
send: 'Send',
notifications: 'Notifications',
noResultsFound: 'No results found',
+ deletedCommentMessage: 'Comment deleted',
+ timePrefix: 'It\'s',
+ conjunctionFor: 'for',
},
attachmentPicker: {
cameraPermissionRequired: 'Camera Permission Required',
@@ -105,7 +108,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..a34d579940da 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -52,6 +52,9 @@ export default {
send: 'Enviar',
notifications: 'Notificaciones',
noResultsFound: 'No se han encontrado resultados',
+ deletedCommentMessage: 'Comentario borrado',
+ timePrefix: 'Son las',
+ conjunctionFor: 'para',
},
attachmentPicker: {
cameraPermissionRequired: 'Se necesita permiso para usar la cámara',
@@ -100,7 +103,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,
},