Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 53003 on room invite sms shown #53240

Merged

Conversation

Kalydosos
Copy link
Contributor

@Kalydosos Kalydosos commented Nov 28, 2024

Explanation of Change

Fixed Issues

$ #53003
PROPOSAL: #53003 (comment)

Tests

  1. Launch app
  2. Open a room chat
  3. Invite a phone number via suggestion eg: +919789945670
  4. Send the message
  5. From whisper, tap invite
  6. Tap header -- member
  7. Open the phone number member
  8. Note expensify.sms is not shown with phone number
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as tests

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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 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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • 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.

Screenshots/Videos

Android: Native
android-native.mp4
Android: mWeb Chrome
android_mweb.mp4
iOS: Native

ios_native

iOS: mWeb Safari

ios_mweb_safari

MacOS: Chrome / Safari

fix_ios_safari

MacOS: Desktop

macos-desktop

@Kalydosos Kalydosos requested a review from a team as a code owner November 28, 2024 07:14
@melvin-bot melvin-bot bot requested review from jayeshmangwani and removed request for a team November 28, 2024 07:14
Copy link

melvin-bot bot commented Nov 28, 2024

@jayeshmangwani Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@Kalydosos
Copy link
Contributor Author

will be changing images for android tests

@jayeshmangwani
Copy link
Contributor

Thanks for the PR! Please also address the ESLint errors and fix the unit tests.

@Kalydosos
Copy link
Contributor Author

ok, i'm working on it

@Kalydosos
Copy link
Contributor Author

Thanks for the PR! Please also address the ESLint errors and fix the unit tests.

the unit tests said failed seems have passed but they are marked failed, what do you think ?

@jayeshmangwani
Copy link
Contributor

the unit tests said failed seems have passed but they are marked failed, what do you think ?

maybe try to merge latest main branch and push again

@jayeshmangwani
Copy link
Contributor

@Kalydosos Have you tested all 13 files where you made these changes?

@Kalydosos
Copy link
Contributor Author

Kalydosos commented Nov 28, 2024

@jayeshmangwani the problem with the tests is the 'NO-BREAK SPACE' (U+00A0) character used here

number = number.replace(/ /g, '\u00A0');

i will modify the tests to replace spaces inside the static strings by that same character like here

expect(participants.at(0)?.displayName).toBe('(833) 240-3627');

@jayeshmangwani
Copy link
Contributor

@Kalydosos Lint is failing here, can you please fix it

@jayeshmangwani
Copy link
Contributor

the problem with the tests is the 'NO-BREAK SPACE' (U+00A0) character used here

I believe we shouldn't change the tests in this PR, as the failures don't seem to be caused by our changes. Or am I missing something?

@Kalydosos
Copy link
Contributor Author

Kalydosos commented Nov 29, 2024

I believe we shouldn't change the tests in this PR, as the failures don't seem to be caused by our changes. Or am I missing something?

@jayeshmangwani formatPhoneNumber replace simple space characters by no-break space characters (which make sense)

number = number.replace(/ /g, '\u00A0');

need_change_tests

@Kalydosos
Copy link
Contributor Author

@Kalydosos Lint is failing here, can you please fix it

@jayeshmangwani the current lint failure have to do with the legacy use of withOnyx in some of the files. It is not from our changes. I guess to deploy on staging they will have to skip that test https://github.com/Expensify/App/actions/runs/12071160259/job/33662272975?pr=53240

@@ -47,7 +48,7 @@ function RoomMemberDetailsPage({report, route}: RoomMemberDetailsPagePageProps)
const member = report?.participants?.[accountID];
const details = personalDetails?.[accountID] ?? ({} as PersonalDetails);
const fallbackIcon = details.fallbackIcon ?? '';
const displayName = details.displayName ?? '';
const displayName = formatPhoneNumber(PersonalDetailsUtils.getDisplayNameOrDefault(details));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO, this is not needed here. We are already using formatPhoneNumber for displayName. Please let me know if there is any case where we explicitly need to apply formatPhoneNumber to the room member's display name.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jayeshmangwani i'll check that

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Kalydosos Please keep the discussion either here or on Slack.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, got it, i was trying not to pollute the PR with questions about your question, got it

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Haha, no problem! Keeping discussion in one place makes things faster, so 😃 .

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i will do a new merge with main

Copy link
Contributor Author

@Kalydosos Kalydosos Dec 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jayeshmangwani i did a test again after the new merge and it's the same result as in the video above

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Kalydosos For me, it’s working fine both with and without using the formatPhoneNumber. I’m not sure why we’re getting different results.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Kalydosos Please leave the RoomMemberDetailsPage.tsx page as it is with the changes you’ve made; we’ll figure this out later. However, can you please check the other comments? I feel we shouldn’t make changes in a few places that I’ve highlighted.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jayeshmangwani I made a test again for this one and i still have the same result., any change on your side for this ?

type: CONST.ICON_TYPE_AVATAR,
id: personalDetail?.accountID,
},
],
descriptiveText: amountText ?? '',
login: personalDetail?.login ?? '',
login: LocalePhoneNumber.formatPhoneNumber(personalDetail?.login ?? ''),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please avoid updating the login here. Instead, we will only update the displayName where it is used to ensure that we do not introduce any regressions.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, i did a test on spliting expenses and i agree. It will be good if you can also confirm by a visual test

icons: [
{
source: personalDetail?.avatar ?? FallbackAvatar,
name: personalDetail?.login ?? '',
name: LocalePhoneNumber.formatPhoneNumber(personalDetail?.login ?? ''),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change necessary here? Instead, we can simply use LocalePhoneNumber.formatPhoneNumber directly where the icons.name key is being used.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here, i did a test on spliting expenses and i agree. It will be good if you can also confirm by a visual test

@luacmartins
Copy link
Contributor

@luacmartins, I’m tagging you here to get your consensus. Please note that in this PR, we are not handling the entire app's usage of displayName. There might still be some pages where users can see the .sms in the phone number.

I think that's ok. Let's address the cases we know of.

@jayeshmangwani
Copy link
Contributor

@Kalydosos I have tested the changes, and they look good. I was able to see the .sms at a few places and noticed differences in phone numbers (with and without country code prefixes). I’m adding the testing steps below. Let me know if these issues are fixable in this PR, or if we should report them and create a new issue:

  1. Go to the workspace and invite a user with a phone number. Then, navigate to the #admins room for that workspace. You should see the message: added [email protected] as member in the chat.
    Screenshot 2024-12-09 at 16 38 32

  2. Create a new account using a phone number. Then, go to Account -> Contact Method -> Press on the phone number and observe the message.

bug-on-verify.mov

@Kalydosos
Copy link
Contributor Author

@jayeshmangwani sounds good. For the issues i will give it a quick estimate.

@jayeshmangwani
Copy link
Contributor

Thanks 🙌

@Kalydosos
Copy link
Contributor Author

Kalydosos commented Dec 9, 2024

@jayeshmangwani for issue 1, i dont really have the same result as you when i follow the steps. Check the image below. Or can you make a video of the detailed steps ? Still i can try and pinpoint the issue at this specific line https://github.com/Kalydosos/App/blob/21da67d809020071722423ff4a93056e6382f150/src/libs/ReportActionsUtils.ts#L1700 but feel free to test it with the steps and let me know if indeed the "email" here can also be a phone number and we can apply the fix

Capture d’écran de 2024-12-09 16-12-01

@Kalydosos
Copy link
Contributor Author

@jayeshmangwani for issue2, i identify the error and fix it
Capture d’écran de 2024-12-09 16-55-54

@jayeshmangwani
Copy link
Contributor

Thanks for making changes, @Kalydosos For issue 1 these are the steps

issue-1.mov

@Kalydosos
Copy link
Contributor Author

@jayeshmangwani issue 1 is also fixed. It requires some extra testing.
Capture d’écran de 2024-12-09 18-37-58

@Kalydosos
Copy link
Contributor Author

@jayeshmangwani do you think we could merge soon ? We are having some merging conflicts but anyway testing is priority

@jayeshmangwani
Copy link
Contributor

I’m hoping that by tomorrow, I can give a final test and then proceed with the merge

Thanks 🙏

@jayeshmangwani
Copy link
Contributor

jayeshmangwani commented Dec 11, 2024

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 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.ts 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.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • 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.mov
Android: mWeb Chrome
mweb-chrome.mov
iOS: Native
iOS.mov
iOS: mWeb Safari
mweb-safari.mov
MacOS: Chrome / Safari
web.mov
MacOS: Desktop
desktop.mov

Copy link
Contributor

@jayeshmangwani jayeshmangwani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🚀

@melvin-bot melvin-bot bot requested a review from luacmartins December 12, 2024 13:24
Copy link
Contributor

@luacmartins luacmartins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@luacmartins luacmartins merged commit ff419fe into Expensify:main Dec 12, 2024
17 checks passed
@OSBotify
Copy link
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

Copy link
Contributor

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.0.76-0 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅
🤖🔄 android HybridApp 🤖🔄 success ✅
🍎🔄 iOS HybridApp 🍎🔄 success ✅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants