Merge pull request #4033 from Expensify/cherry-pick-staging-4020

🍒 Cherry pick PR #4020 to staging 🍒
Expensify · Jul 14, 2021 · 17e30ab · 17e30ab
2 parents 415841b + fddf40a
commit 17e30ab
Show file tree

Hide file tree

Showing 10 changed files with 47 additions and 26 deletions.
diff --git 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
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.77.2</string>
+	<string>1.0.77.3</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.77.2</string>
+	<string>1.0.77.3</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
diff --git 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
@@ -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
@@ -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
@@ -58,21 +58,24 @@ class ParticipantLocalTime extends React.Component {
         return (
             isReportRecipientLocalTimeReady ? (
                 <View style={[styles.chatItemComposeSecondaryRow]}>
-                    <ExpensiText
-                        style={[
-                            styles.chatItemComposeSecondaryRowSubText,
-                            styles.chatItemComposeSecondaryRowOffset,
-                        ]}
-                        numberOfLines={1}
+                    <View style={[
+                        styles.chatItemComposeSecondaryRowOffset,
+                        styles.flexRow,
+                        styles.alignItemsCenter]}
                     >
-                        {this.props.translate(
-                            'reportActionCompose.localTime',
-                            {
-                                user: reportRecipientDisplayName,
-                                time: this.state.localTime,
-                            },
-                        )}
-                    </ExpensiText>
+                        <ExpensiText style={[styles.chatItemComposeSecondaryRowSubText, styles.mr1]}>
+                            {this.props.translate('common.timePrefix')}
+                        </ExpensiText>
+                        <ExpensiText style={[styles.textMicroSupportingBold, styles.mr1]}>
+                            {this.state.localTime}
+                        </ExpensiText>
+                        <ExpensiText style={[styles.chatItemComposeSecondaryRowSubText, styles.mr1]}>
+                            {this.props.translate('common.conjunctionFor')}
+                        </ExpensiText>
+                        <ExpensiText style={[styles.textMicroSupportingBold]}>
+                            {reportRecipientDisplayName}
+                        </ExpensiText>
+                    </View>
                 </View>
             )
                 : <View style={[styles.chatItemComposeSecondaryRow]} />

diff --git 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,
                         ]}
                         >
-                            <Text style={[styles.textStrong]}>{getDisplayName(this.state.usersTyping[0])}</Text>
+                            <Text style={[styles.textMicroSupportingBold]}>
+                                {getDisplayName(this.state.usersTyping[0])}
+                            </Text>
                             {` ${this.props.translate('reportTypingIndicator.isTyping')}`}
                         </Text>
                     </View>
@@ -72,9 +74,13 @@ class ReportTypingIndicator extends React.Component {
                             styles.chatItemComposeSecondaryRowOffset,
                         ]}
                         >
-                            <Text style={[styles.textStrong]}>{getDisplayName(this.state.usersTyping[0])}</Text>
+                            <Text style={[styles.textMicroSupportingBold]}>
+                                {getDisplayName(this.state.usersTyping[0])}
+                            </Text>
                             {` ${this.props.translate('common.and')} `}
-                            <Text style={[styles.textStrong]}>{getDisplayName(this.state.usersTyping[1])}</Text>
+                            <Text style={[styles.textMicroSupportingBold]}>
+                                {getDisplayName(this.state.usersTyping[1])}
+                            </Text>
                             {` ${this.props.translate('reportTypingIndicator.areTyping')}`}
                         </Text>
                     </View>
@@ -87,7 +93,7 @@ class ReportTypingIndicator extends React.Component {
                             styles.chatItemComposeSecondaryRowOffset,
                         ]}
                         >
-                            <Text style={[styles.textStrong]}>
+                            <Text style={[styles.textMicroSupportingBold]}>
                                 {this.props.translate('reportTypingIndicator.multipleUsers')}
                             </Text>
                             {` ${this.props.translate('reportTypingIndicator.areTyping')}`}

diff --git 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,
     },