Merge pull request #3399 from Expensify/main

Expensify · Jun 7, 2021 · 147ec11 · 147ec11
2 parents 36b8f51 + 81e94c9
commit 147ec11
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 20 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 1001006302
-        versionName "1.0.63-2"
+        versionCode 1001006303
+        versionName "1.0.63-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.63.2</string>
+	<string>1.0.63.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.63.2</string>
+	<string>1.0.63.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.63-2",
+  "version": "1.0.63-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/pages/home/HeaderView.js b/src/pages/home/HeaderView.js
@@ -60,14 +60,14 @@ const HeaderView = (props) => {
     const isMultipleParticipant = participants.length > 1;
     const displayNamesWithTooltips = _.map(
         getPersonalDetailsForLogins(participants, props.personalDetails),
-        ({displayName, firstName, login}) => (
-            {
-                displayName: props.toLocalPhone(
-                    (isMultipleParticipant ? firstName : displayName) || Str.removeSMSDomain(login),
-                ),
+        ({displayName, firstName, login}) => {
+            const displayNameTrimmed = Str.isSMSLogin(login) ? props.toLocalPhone(displayName) : displayName;
+
+            return {
+                displayName: (isMultipleParticipant ? firstName : displayNameTrimmed) || Str.removeSMSDomain(login),
                 tooltip: login,
-            }
-        ),
+            };
+        },
     );
     const fullTitle = displayNamesWithTooltips.map(({displayName}) => displayName).join(', ');
     return (

diff --git a/src/pages/home/sidebar/OptionRow.js b/src/pages/home/sidebar/OptionRow.js
@@ -130,14 +130,14 @@ const OptionRow = ({
     const isMultipleParticipant = lodashGet(option, 'participantsList.length', 0) > 1;
     const displayNamesWithTooltips = _.map(
         option.participantsList,
-        ({displayName, firstName, login}) => (
-            {
-                displayName: toLocalPhone(
-                    (isMultipleParticipant ? firstName : displayName) || Str.removeSMSDomain(login),
-                ),
+        ({displayName, firstName, login}) => {
+            const displayNameTrimmed = Str.isSMSLogin(login) ? toLocalPhone(displayName) : displayName;
+
+            return {
+                displayName: (isMultipleParticipant ? firstName : displayNameTrimmed) || Str.removeSMSDomain(login),
                 tooltip: login,
-            }
-        ),
+            };
+        },
     );
     return (
         <Hoverable>