From 1f3056f408fcdaefc2ce607c675f96c21c985ce5 Mon Sep 17 00:00:00 2001 From: Rajat Parashar Date: Mon, 7 Jun 2021 20:44:28 +0530 Subject: [PATCH 1/2] fix: name was cropped --- src/pages/home/HeaderView.js | 14 +++++++------- src/pages/home/sidebar/OptionRow.js | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/pages/home/HeaderView.js b/src/pages/home/HeaderView.js index 9881b87cb957..d5c205af9c47 100644 --- 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 index c75b7dd5e2f1..9fed30b58560 100644 --- 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 ( From 2051e3070b0192fb52880f5e295255e61ec4a925 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Mon, 7 Jun 2021 16:17:30 +0000 Subject: [PATCH 2/2] Update version to 1.0.63-3 --- 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 e5ebd2554c17..dcf9d8e386f4 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 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 index 6464fb571ac9..393d313a0f8f 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.0.63.2 + 1.0.63.3 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index dbe46c7410e2..0826ca585730 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.63.2 + 1.0.63.3 diff --git a/package-lock.json b/package-lock.json index 5f69b6ce1313..15ab3c3d1239 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.63-2", + "version": "1.0.63-3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b714e1373481..d8defd09aa77 100644 --- 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.",