From ef752cd33e9c83e5ee0b64b976886f5fc58bec65 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Wed, 14 Jul 2021 05:29:07 -0700 Subject: [PATCH 1/3] Merge pull request #4032 from Expensify/version-BUILD-0639c6771204ceb1c91926813fb2b3368c49a8b6 (cherry picked from commit 6cda0beb3272fd0ad51a7641ce89823f4d735687) --- android/app/build.gradle | 4 ++-- ios/ExpensifyCash/Info.plist | 2 +- ios/ExpensifyCashTests/Info.plist | 2 +- package-lock.json | 2 +- package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) 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.", From 53fd87ca441ef0f539ef1b6afd811a62572eca1d Mon Sep 17 00:00:00 2001 From: Alex Beaman Date: Wed, 14 Jul 2021 14:26:37 +0200 Subject: [PATCH 2/3] Merge pull request #4020 from Expensify/Rory-FixUserTypingIndicator Fix display of report typing indicator and participant local time (cherry picked from commit 0639c6771204ceb1c91926813fb2b3368c49a8b6) --- src/languages/en.js | 7 ++++- src/languages/es.js | 7 ++++- src/pages/home/report/ParticipantLocalTime.js | 31 ++++++++++--------- .../home/report/ReportTypingIndicator.js | 14 ++++++--- src/styles/styles.js | 8 +++++ 5 files changed, 47 insertions(+), 20 deletions(-) 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, }, From fddf40a4b87294ce490a94dd7916627d92f5763f Mon Sep 17 00:00:00 2001 From: Rory Abraham Date: Wed, 14 Jul 2021 09:23:05 -0700 Subject: [PATCH 3/3] Manually resolve merge conflicts --- src/languages/en.js | 3 --- src/languages/es.js | 3 --- 2 files changed, 6 deletions(-) diff --git a/src/languages/en.js b/src/languages/en.js index ab37146fa98a..62e6955791d7 100755 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -56,12 +56,9 @@ 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', diff --git a/src/languages/es.js b/src/languages/es.js index b93e1734b820..a34d579940da 100644 --- a/src/languages/es.js +++ b/src/languages/es.js @@ -52,12 +52,9 @@ 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',