Replace email by You #49315

aldo-expensify · 2024-09-16T22:51:36Z

Details

Replaces your email by You in the report's next step:

Report waiting to be submitted
1. from the creator's point of view:
2. from the policy owner's point of view:
3. from the approver's point of view:
Report waiting to be approved
1. from the creator's point of view:
2. from the policy owner's point of view:
3. from the approver's point of view:

Fixed Issues

$ #47933
PROPOSAL:

Tests

Create a Control workspace in OldDot
Set an approver that isn't the workspace owner
Have an employee that's not the approver or admin submit an expense to the workspace chat in NewDot
Verify that the employee see the approver's email in the next step:
Open the report as the approver in NewDot
Verify that you see You in the next steps instead of the approver's email
Set a "Display Name" for the approver and go back to the report
Verify that you still see You in the next steps instead of the approver's display name

Verify that no errors appear in the JS console

Offline tests

QA Steps

Create a Control workspace in OldDot
Set an approver that isn't the workspace owner
Have an employee that's not the approver or admin submit an expense to the workspace chat in NewDot
Verify that the employee see the approver's email in the next step:
Open the report as the approver in NewDot
Verify that you see You in the next steps instead of the approver's email
Set a "Display Name" for the approver and go back to the report
Verify that you still see You in the next steps instead of the approver's display name

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

    <img width="644" alt="image" src="https://github.com/user-attachments/assets/a5291914-1123-4530-8729-5dc11827a8a6">

MacOS: Desktop

melvin-bot · 2024-09-16T23:29:30Z

@ishpaul777 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]

ishpaul777 · 2024-09-17T09:39:40Z

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

Screen.Recording.2024-09-18.at.2.12.38.AM.mov

Android: mWeb Chrome

Uploading Screen Recording 2024-09-18 at 2.36.44 AM.mov…

Screen.Recording.2024-09-18.at.2.36.44.AM.mov

iOS: Native

Screen.Recording.2024-09-18.at.2.02.13.AM.mov

iOS: mWeb Safari

Untitled.mov

MacOS: Chrome / Safari

Untitled.mov

Screen.Recording.2024-09-18.at.1.53.20.AM.mov

MacOS: Desktop

Screen.Recording.2024-09-18.at.2.21.11.AM.mov

ishpaul777 · 2024-09-17T10:14:10Z

src/libs/NextStepUtils.ts

        let tagType = part.type ?? 'span';
        let content = Str.safeEscape(part.text);

-        if (isEmail) {
+        if (currentUserEmail === part.text) {


if user has a display name it shows the displayname is that fine (intended)

hmm I didn't test that, I think we should still show You if you have a display name. I'll work on that.

The messages contain this:

[ { "text": "Waiting for " }, { "text": "Approver's Name Approver's LastName", "type": "strong", "tooltipText": "approver@wp-advanced-approval4.com (click to copy)", "clickToCopyText": "approver@wp-advanced-approval4.com" }, { "text": " to " }, { "text": "pay5" }, { "text": " %expenses." } ]

I'm going to use the part.clickToCopyText as a fallback to check because the email should be there if it is not in part.text. I don't expect to find the current user email in clickToCopyText in cases other than when we are trying to show the current user email (there shouldn't be false positives).

aldo-expensify · 2024-09-17T18:41:03Z

Thanks @ishpaul777 , good catch. I also noticed I forgot to add the testing / QA steps, so I added them now 🤦 .

ishpaul777 · 2024-09-17T18:44:29Z

Nice, QQ- how do i create a account with no displayname i think its now mandatory adding a display name in onboarding flow

aldo-expensify · 2024-09-17T18:46:41Z

Oh, I think I may have done it by inviting from old dot a non-existing account into the policy.

…

On Tue, Sep 17, 2024, 11:44 Ishpaul Singh ***@***.***> wrote: Nice, QQ- how do i create a account with no displayname i think its now mandatory adding a display name in onboarding flow — Reply to this email directly, view it on GitHub <#49315 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AU2LVBWBQAMTQOBX6HHXJNLZXB2CHAVCNFSM6AAAAABOKH5ME2VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDGNJWGY2DQNBUGA> . You are receiving this because you authored the thread.Message ID: ***@***.***>

aldo-expensify · 2024-09-17T19:02:41Z

Nice, QQ- how do i create a account with no displayname i think its now mandatory adding a display name in onboarding flow

I see that if you create the account in OldDot, once you sign in in NewDot, the modal forcing you to put the display name won't appear

ishpaul777 · 2024-09-17T19:24:11Z

I'll try with a very old account and see if that works. I'll be out for a bit, so give me around 30 minutes

aldo-expensify · 2024-09-17T19:26:17Z

I'll try with a very old account and see if that works. I'll be out for a bit, so give me around 30 minutes

Sure, no rush

ishpaul777 · 2024-09-17T20:33:14Z

it worked 👍 just completing checklist videos Rest LGTM!

melvin-bot · 2024-09-17T21:08:34Z

@lakchote 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]

OSBotify · 2024-09-18T06:46:21Z

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

OSBotify · 2024-09-18T22:53:46Z

🚀 Deployed to staging by https://github.com/lakchote in version: 9.0.38-0 🚀

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

OSBotify · 2024-09-19T23:35:00Z

🚀 Deployed to production by https://github.com/grgia in version: 9.0.38-4 🚀

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

Replace email by You

0312476

aldo-expensify self-assigned this Sep 16, 2024

Revert changes committed by mistake

518bfba

aldo-expensify mentioned this pull request Sep 16, 2024

[Simple AA in NewDot] Next Steps for approver are incorrect when Advanced Approval is enabled #47933

Closed

6 tasks

aldo-expensify marked this pull request as ready for review September 16, 2024 23:29

aldo-expensify requested a review from a team as a code owner September 16, 2024 23:29

melvin-bot bot requested a review from ishpaul777 September 16, 2024 23:29

melvin-bot bot removed the request for review from a team September 16, 2024 23:29

ishpaul777 reviewed Sep 17, 2024

View reviewed changes

Handle when user has display name

18ce38b

ishpaul777 approved these changes Sep 17, 2024

View reviewed changes

melvin-bot bot requested a review from lakchote September 17, 2024 21:08

lakchote approved these changes Sep 18, 2024

View reviewed changes

lakchote merged commit 839fb44 into main Sep 18, 2024
19 checks passed

lakchote deleted the aldo_use-you-if-you-are-approver branch September 18, 2024 06:35

github-actions bot mentioned this pull request Sep 18, 2024

Deploy Checklist: New Expensify 2024-09-18 #49427

Closed

43 tasks

grgia mentioned this pull request Sep 19, 2024

[HOLD for payment 2024-09-26] Expense - Bad grammar "You's expense(s)" instead of "Your expense(s)" in report banner #49466

Closed

6 tasks

IuliiaHerets mentioned this pull request Sep 19, 2024

Expense - Banner shows user email/name first, then "You" instead of "You" directly #49484

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replace email by You #49315

Replace email by You #49315

aldo-expensify commented Sep 16, 2024 •

edited

Loading

melvin-bot bot commented Sep 16, 2024

ishpaul777 commented Sep 17, 2024 •

edited

Loading

ishpaul777 Sep 17, 2024

aldo-expensify Sep 17, 2024 •

edited

Loading

aldo-expensify Sep 17, 2024 •

edited

Loading

aldo-expensify commented Sep 17, 2024

ishpaul777 commented Sep 17, 2024

aldo-expensify commented Sep 17, 2024 via email

aldo-expensify commented Sep 17, 2024

ishpaul777 commented Sep 17, 2024

aldo-expensify commented Sep 17, 2024

ishpaul777 commented Sep 17, 2024

melvin-bot bot commented Sep 17, 2024

OSBotify commented Sep 18, 2024

OSBotify commented Sep 18, 2024

OSBotify commented Sep 19, 2024

Replace email by You #49315

Replace email by You #49315

Conversation

aldo-expensify commented Sep 16, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Sep 16, 2024

ishpaul777 commented Sep 17, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

ishpaul777 Sep 17, 2024

Choose a reason for hiding this comment

aldo-expensify Sep 17, 2024 • edited Loading

Choose a reason for hiding this comment

aldo-expensify Sep 17, 2024 • edited Loading

Choose a reason for hiding this comment

aldo-expensify commented Sep 17, 2024

ishpaul777 commented Sep 17, 2024

aldo-expensify commented Sep 17, 2024 via email

aldo-expensify commented Sep 17, 2024

ishpaul777 commented Sep 17, 2024

aldo-expensify commented Sep 17, 2024

ishpaul777 commented Sep 17, 2024

melvin-bot bot commented Sep 17, 2024

OSBotify commented Sep 18, 2024

OSBotify commented Sep 18, 2024

OSBotify commented Sep 19, 2024

aldo-expensify commented Sep 16, 2024 •

edited

Loading

ishpaul777 commented Sep 17, 2024 •

edited

Loading

aldo-expensify Sep 17, 2024 •

edited

Loading

aldo-expensify Sep 17, 2024 •

edited

Loading