From acd7df518ba1fb0ec389cd207790cd15c13def1f Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Tue, 20 Jul 2021 10:40:11 -0600 Subject: [PATCH 1/3] fix phone style --- src/pages/DetailsPage.js | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/src/pages/DetailsPage.js b/src/pages/DetailsPage.js index c36129e5d319..91af858f86ee 100755 --- a/src/pages/DetailsPage.js +++ b/src/pages/DetailsPage.js @@ -92,22 +92,11 @@ const DetailsPage = ({ imageStyles={[styles.avatarLarge]} source={details.avatar} /> - {details.displayName && isSMSLogin - ? ( - - - {toLocalPhone(details.displayName)} - - - ) : ( - - {details.displayName || null} - - )} + {details.displayName && ( + + {isSMSLogin ? toLocalPhone(details.displayName) : details.displayName || null} + + )} {details.login ? ( From 0be9de358a0162ef2d29e67dce9c9161d732e414 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Tue, 20 Jul 2021 10:47:48 -0600 Subject: [PATCH 2/3] simplify conditional --- src/pages/DetailsPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/DetailsPage.js b/src/pages/DetailsPage.js index 91af858f86ee..9a4966651a67 100755 --- a/src/pages/DetailsPage.js +++ b/src/pages/DetailsPage.js @@ -94,7 +94,7 @@ const DetailsPage = ({ /> {details.displayName && ( - {isSMSLogin ? toLocalPhone(details.displayName) : details.displayName || null} + {isSMSLogin ? toLocalPhone(details.displayName) : details.displayName} )} {details.login ? ( From e5974e6cae4faa17d8ac544f2d25dab1aff34b04 Mon Sep 17 00:00:00 2001 From: Carlos Martins Date: Tue, 20 Jul 2021 12:57:31 -0600 Subject: [PATCH 3/3] fix style --- src/components/CommunicationsLink.js | 13 ++++++------- src/pages/DetailsPage.js | 2 +- src/styles/styles.js | 6 ++---- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/components/CommunicationsLink.js b/src/components/CommunicationsLink.js index c60ced905fc8..bbaa924ebc08 100644 --- a/src/components/CommunicationsLink.js +++ b/src/components/CommunicationsLink.js @@ -44,16 +44,15 @@ const CommunicationsLink = props => ( > {props.children} - ) - : props.children} - {!props.isSmallScreenWidth - && ( + ) : ( + {props.children} )} {details.login ? ( - + {translate(isSMSLogin ? 'common.phoneNumber' diff --git a/src/styles/styles.js b/src/styles/styles.js index 854cef4d0049..40cf62fd509d 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -1793,10 +1793,8 @@ const styles = { ...whiteSpace.noWrap, }, - communicationsLinkIcon: { - right: -36, - top: 0, - bottom: 0, + communicationsLinkHeight: { + height: 20, }, };