feat: add is valid phone number by nkdengineer · Pull Request #697 · Expensify/expensify-common

nkdengineer · 2024-05-15T09:25:03Z

Fixed Issues

$ Expensify/App#41078

Tests

What unit/integration tests cover your change? What autoQA tests cover your change?
What tests did you perform that validates your changed worked?

QA

Go to https://staging.new.expensify.com
Tap on a room report
Enter @+91 and send the message
Verify that: not consider @+91 is a valid mention.

hungvu193

Looks good, I added 2 minor comments

hungvu193 · 2024-05-15T09:50:51Z

+                    const metionWithoutSMSDomain = Str.removeSMSDomain(mention);
+                    if (
+                        !Str.isValidMention(match) ||
+                        (new RegExp(`^${Constants.CONST.REG_EXP.PHONE_PART}$`).test(metionWithoutSMSDomain) && !Str.isValidPhoneNumber(metionWithoutSMSDomain))


can we reuse phoneRegex here?

@hungvu193 We can't because those are two different Regex

ah ok, can you create a variable for it?

@hungvu193 please check again

hungvu193 · 2024-05-15T09:52:05Z

+     */
+
+    isValidPhoneNumber(phone) {
+        return parsePhoneNumber(this.removeSMSDomain(phone)).possible;


I saw you already remove sms domain inside ExpensifyMark, do we really need to remove sms domain once again here?

@hungvu193 i updated, please check again

blimpich · 2024-05-15T17:15:14Z

Unassigned myself, will review once @hungvu193 approves. Its important for some Expensify-specific automations that the internal engineer is auto-assigned, so hopefully once @hungvu193 approves I'll be auto-assigned back to the review. If that doesn't happen just ping me.

hungvu193 · 2024-05-15T23:52:01Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2024-05-14.at.11.05.21.mov

MacOS: Desktop

hungvu193

LGTM!

hungvu193 · 2024-05-15T23:52:40Z

All yours @blimpich

blimpich

Few comments, otherwise looks good.

Do we have a plan to create a follow up PR to upgrade App's expensify-common library? Otherwise this change won't work in the app right?

blimpich · 2024-05-16T16:53:57Z

-                    if (!Str.isValidMention(match)) {
+                    const phoneNumberRegex = new RegExp(`^${Constants.CONST.REG_EXP.PHONE_PART}$`);
+                    const mention = g2.slice(1);
+                    const metionWithoutSMSDomain = Str.removeSMSDomain(mention);


Suggested change

const metionWithoutSMSDomain = Str.removeSMSDomain(mention);

const mentionWithoutSMSDomain = Str.removeSMSDomain(mention);

hungvu193 · 2024-05-16T23:44:04Z

Yeah, we will have a PR to upgrade expensify-common.

Co-authored-by: Benjamin Limpich <blimpich@expensify.com>

nkdengineer · 2024-05-17T10:10:25Z

@blimpich i updated, please check again

blimpich

Looks good! Will approve but will wait to merge until the merge freeze is officially over.

nkdengineer · 2024-05-28T02:39:42Z

@blimpich Can we merge this now?

blimpich · 2024-05-28T17:07:31Z

Merge freeze/slush isn't over yet, hopefully will merge tomorrow 🙂

Sorry for the delay

blimpich · 2024-05-28T21:29:50Z

Just got the all clear. Lets merge 🎉

github-actions · 2024-05-28T21:30:48Z

🚀Published to npm in v2.0.4

nkdengineer added 3 commits May 15, 2024 16:24

feat: add is valid phone number

1c716c7

fix chore

647ffef

fix comment position

322d7b7

nkdengineer marked this pull request as ready for review May 15, 2024 09:47

nkdengineer requested a review from a team as a code owner May 15, 2024 09:47

melvin-bot Bot requested review from srikarparsi and removed request for a team May 15, 2024 09:47

nkdengineer mentioned this pull request May 15, 2024

[HOLD for payment 2024-06-28] [HOLD for payment 2024-06-20][$250] Room-User is allowed to invite via mentions invalid number. Expensify/App#41078

Closed

3 of 6 tasks

hungvu193 reviewed May 15, 2024

View reviewed changes

nkdengineer added 2 commits May 15, 2024 17:51

remove useless code

4e9cdb0

rename variable

fa06483

srikarparsi requested review from blimpich and removed request for srikarparsi May 15, 2024 17:05

blimpich removed their request for review May 15, 2024 17:13

hungvu193 approved these changes May 15, 2024

View reviewed changes

blimpich requested changes May 16, 2024

View reviewed changes

nkdengineer and others added 3 commits May 17, 2024 17:07

Update lib/str.d.ts

0c0c65c

Co-authored-by: Benjamin Limpich <blimpich@expensify.com>

Update lib/str.js

1369f15

Co-authored-by: Benjamin Limpich <blimpich@expensify.com>

fix: typo

9192abe

blimpich approved these changes May 17, 2024

View reviewed changes

blimpich merged commit a451327 into Expensify:main May 28, 2024

nkdengineer mentioned this pull request May 30, 2024

Bump expensify-common to 2.0.10 Expensify/react-native-live-markdown#360

Merged

	const metionWithoutSMSDomain = Str.removeSMSDomain(mention);
	const mentionWithoutSMSDomain = Str.removeSMSDomain(mention);

Conversation

nkdengineer commented May 15, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Fixed Issues

Tests

QA

Uh oh!

hungvu193 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hungvu193 May 15, 2024

Choose a reason for hiding this comment

Uh oh!

nkdengineer May 15, 2024

Choose a reason for hiding this comment

Uh oh!

hungvu193 May 15, 2024

Choose a reason for hiding this comment

Uh oh!

nkdengineer May 15, 2024

Choose a reason for hiding this comment

Uh oh!

hungvu193 May 15, 2024

Choose a reason for hiding this comment

Uh oh!

nkdengineer May 15, 2024

Choose a reason for hiding this comment

Uh oh!

blimpich commented May 15, 2024

Uh oh!

hungvu193 commented May 15, 2024

Reviewer Checklist

Screenshots/Videos

Uh oh!

hungvu193 left a comment

Choose a reason for hiding this comment

Uh oh!

hungvu193 commented May 15, 2024

Uh oh!

blimpich left a comment

Choose a reason for hiding this comment

Uh oh!

blimpich May 16, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

hungvu193 commented May 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nkdengineer commented May 17, 2024

Uh oh!

blimpich left a comment

Choose a reason for hiding this comment

Uh oh!

nkdengineer commented May 28, 2024

Uh oh!

blimpich commented May 28, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

blimpich commented May 28, 2024

Uh oh!

github-actions Bot commented May 28, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

nkdengineer commented May 15, 2024 •

edited

Loading

hungvu193 left a comment •

edited

Loading

hungvu193 commented May 16, 2024 •

edited

Loading

blimpich commented May 28, 2024 •

edited

Loading