From 6b96b911e5f25641bca0bbc44a61f772b34db27e Mon Sep 17 00:00:00 2001 From: johndev0711 Date: Fri, 26 Mar 2021 10:21:48 +0100 Subject: [PATCH 1/3] fix-new-chat --- src/CONST.js | 2 +- src/libs/OptionsListUtils.js | 9 +++++++-- src/pages/NewChatPage.js | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/CONST.js b/src/CONST.js index 2888611097d3..ee2446ef0540 100644 --- a/src/CONST.js +++ b/src/CONST.js @@ -59,7 +59,7 @@ const CONST = { }, MESSAGES: { // eslint-disable-next-line max-len - NO_CONTACTS_FOUND: 'Don\'t see who you\'re looking for? Type their email or phone number to invite them to chat.', + NO_PHONE_NUMBER: 'Please enter a phone number including the country code e.g +447814266907', MAXIMUM_PARTICIPANTS_REACHED: 'You\'ve reached the maximum number of participants for a group chat.', }, PRIORITY_MODE: { diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js index 143203a45ba2..21a1f0cea9fb 100644 --- a/src/libs/OptionsListUtils.js +++ b/src/libs/OptionsListUtils.js @@ -407,16 +407,21 @@ function getSidebarOptions(reports, personalDetails, draftComments, activeReport * * @param {Boolean} hasSelectableOptions * @param {Boolean} hasUserToInvite + * @param {String} searchValue * @param {Boolean} [maxParticipantsReached] * @return {String} */ -function getHeaderMessage(hasSelectableOptions, hasUserToInvite, maxParticipantsReached = false) { +function getHeaderMessage(hasSelectableOptions, hasUserToInvite, searchValue, maxParticipantsReached = false) { if (maxParticipantsReached) { return CONST.MESSAGES.MAXIMUM_PARTICIPANTS_REACHED; } if (!hasSelectableOptions && !hasUserToInvite) { - return CONST.MESSAGES.NO_CONTACTS_FOUND; + if (/^\d+$/.test(searchValue)) { + return CONST.MESSAGES.NO_PHONE_NUMBER; + } + + return searchValue; } return ''; diff --git a/src/pages/NewChatPage.js b/src/pages/NewChatPage.js index 9a428e7d71b6..86e4793dc80c 100644 --- a/src/pages/NewChatPage.js +++ b/src/pages/NewChatPage.js @@ -108,6 +108,7 @@ class NewChatPage extends Component { const headerMessage = getHeaderMessage( this.state.personalDetails.length !== 0, Boolean(this.state.userToInvite), + this.state.searchValue, ); return ( From c5eb18f548e985ac509b890bc8240d0ded6d7383 Mon Sep 17 00:00:00 2001 From: John A <74647446+johndev0711@users.noreply.github.com> Date: Fri, 26 Mar 2021 10:36:42 +0100 Subject: [PATCH 2/3] Update NewChatPage.js --- src/pages/NewChatPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/NewChatPage.js b/src/pages/NewChatPage.js index 86e4793dc80c..2c8beef2f6e0 100644 --- a/src/pages/NewChatPage.js +++ b/src/pages/NewChatPage.js @@ -108,7 +108,7 @@ class NewChatPage extends Component { const headerMessage = getHeaderMessage( this.state.personalDetails.length !== 0, Boolean(this.state.userToInvite), - this.state.searchValue, + this.state.searchValue, ); return ( From 5ba06d6e3aef08d7c562db18ef020706c1f24c20 Mon Sep 17 00:00:00 2001 From: John A <74647446+johndev0711@users.noreply.github.com> Date: Fri, 26 Mar 2021 10:41:44 +0100 Subject: [PATCH 3/3] Update NewChatPage.js --- src/pages/NewChatPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/NewChatPage.js b/src/pages/NewChatPage.js index 2c8beef2f6e0..e3cc6be6027c 100644 --- a/src/pages/NewChatPage.js +++ b/src/pages/NewChatPage.js @@ -108,7 +108,7 @@ class NewChatPage extends Component { const headerMessage = getHeaderMessage( this.state.personalDetails.length !== 0, Boolean(this.state.userToInvite), - this.state.searchValue, + this.state.searchValue, ); return (