Skip to content

Fix-55026: Make shouldShowAddMissingDetails condition consistent#55510

Merged
mountiny merged 13 commits intoExpensify:mainfrom
DylanDylann:dylann-fix-55026
Feb 28, 2025
Merged

Fix-55026: Make shouldShowAddMissingDetails condition consistent#55510
mountiny merged 13 commits intoExpensify:mainfrom
DylanDylann:dylann-fix-55026

Conversation

@DylanDylann
Copy link
Contributor

@DylanDylann DylanDylann commented Jan 21, 2025

Explanation of Change

Fixed Issues

$ #55026
PROPOSAL: #55026 (comment)

Tests

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  1. Assign a new physical Expensify Card to account A in workspace B (Note that: account A haven't completed the personal detail)
  2. Login to account A
  3. Go to workspace B chat
  4. Verify this message appears: "issued *** an Expensify Card! The card will be shipped once shipping details are added." with the "Add shipping Detail" button
  5. On the admin account there are no "Add shipping Detail" button
  6. Go to profile page
  7. Fill all personal information
  8. Back to workspace B chat
  9. Clicking on "Add shipping Detail" button
  10. All information in step 6 are displayed
  11. Clicking confirm
  12. Verify this message appears: " *** added shipping details. Expensify Card will arrive in 2-3 business days." without the "Add shipping Detail" button
  • 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
Screen.Recording.2025-02-25.at.20.18.26.mov
Android: mWeb Chrome
Screen.Recording.2025-02-25.at.20.14.21.mov
iOS: Native
Screen.Recording.2025-02-25.at.20.13.21.mov
iOS: mWeb Safari
Screen.Recording.2025-02-25.at.19.47.30.mov
MacOS: Chrome / Safari
Screen.Recording.2025-02-25.at.19.41.10.mov
MacOS: Desktop
Screen.Recording.2025-02-25.at.19.46.12.mov

@DylanDylann DylanDylann requested a review from a team as a code owner January 21, 2025 09:56
@melvin-bot melvin-bot bot requested review from allgandalf and removed request for a team January 21, 2025 09:56
@melvin-bot
Copy link

melvin-bot bot commented Jan 21, 2025

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

@allgandalf
Copy link
Contributor

@DylanDylann can you update the recordings please 😄

@mountiny
Copy link
Contributor

Please add tests and description to the PR too

@allgandalf
Copy link
Contributor

I also think this can be QA'ed easily so please update the title accordingly

@DylanDylann
Copy link
Contributor Author

DylanDylann commented Jan 22, 2025

I am checking it again

@DylanDylann DylanDylann changed the title [No QA]: Fix-55026: Make shouldShowAddMissingDetails condition consistent Fix-55026: Make shouldShowAddMissingDetails condition consistent Jan 23, 2025
@allgandalf
Copy link
Contributor

@DylanDylann any updates here?

@allgandalf
Copy link
Contributor

@DylanDylann did we make progress here, is this ready for review ?

@DylanDylann
Copy link
Contributor Author

@allgandalf The PR is ready. But we need to wait the BE update

@mountiny
Copy link
Contributor

@DylanDylann To confirm, the change you mean is that the SetPersonal... command returns the updated card data?

@DylanDylann
Copy link
Contributor Author

DylanDylann commented Jan 27, 2025

@mountiny Yes

The BE need to update card.state when SetPersonalDetailsAndShipExpensifyCards is called with the correct params and validated code

@DylanDylann
Copy link
Contributor Author

@allgandalf The rest is ready to review, you can start on this one

@allgandalf
Copy link
Contributor

sure thing!!!!

@allgandalf
Copy link
Contributor

@DylanDylann please update platform videos

@DylanDylann
Copy link
Contributor Author

@allgandalf I will test and upload all videos after the BE is completed

@allgandalf
Copy link
Contributor

sure, let me know once this is ready

@DylanDylann
Copy link
Contributor Author

@mountiny Still waiting for BE update

@allgandalf
Copy link
Contributor

@DylanDylann please fix the conflicts too

@joekaufmanexpensify
Copy link
Contributor

Either is fine with me, just LMK!

@allgandalf
Copy link
Contributor

would help a lot if you test on ad-hoc on any one of the platforms @joekaufmanexpensify 🙇

@joekaufmanexpensify
Copy link
Contributor

Didn't get to this today but will test tomorrow!

@DylanDylann
Copy link
Contributor Author

@allgandalf Could you complete the checklist soon?

@allgandalf
Copy link
Contributor

allgandalf commented Feb 27, 2025

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
Screen.Recording.2025-02-27.at.1.29.12.PM.mov
Android: mWeb Chrome
Screen.Recording.2025-02-27.at.1.31.29.PM.mov
iOS: Native
Screen.Recording.2025-02-27.at.1.23.35.PM.mov
iOS: mWeb Safari Screenshot 2025-02-27 at 1 26 10 PM
MacOS: Chrome / Safari
Screen.Recording.2025-02-27.at.1.21.47.PM.mov
MacOS: Desktop
Screen.Recording.2025-02-27.at.1.24.31.PM.mov

@allgandalf
Copy link
Contributor

Nitpick: @DylanDylann please update QA step 1 to state that we need to assign physical card

…deModal.tsx

Co-authored-by: Gandalf <whogandalf@gmail.com>
@melvin-bot melvin-bot bot requested a review from mountiny February 27, 2025 08:02
@joekaufmanexpensify
Copy link
Contributor

Admin view with message but no button to add shipping details

image

Member view shows message with button

image

Clicking button after entering profile shows it pre-filled

2025-02-27_13-12-43.mp4

Ordering card lands you on workspace chat with correct message and button gone

image

@joekaufmanexpensify
Copy link
Contributor

Only feedback is I found it a bit odd that we replaced the original message saying the employee was assigned the card with the one saying they added their shipping details. Is that intentional?

I feel like it would be more clear if we left the original message and then added a new system message from the employee as a second step. Because the audit trail right now says jkaufman@cardtest.expensify.com as the messenger for jkaufman+physicalcardtest@expensifail.com adding shipping details, which is kind of odd given they were two different actions taken by two different accounts.

@joekaufmanexpensify
Copy link
Contributor

Oh interesting. After reloading the page, I do see two system messages. But they are out of order and the person they're from is wrong. The second message is from the member issuing the card (when it was actually the admin).

image

And the first message is from the admin adding shipping details (when it was actually the member.

image

We should clean that up. Otherwise worked great!

@DylanDylann
Copy link
Contributor Author

@joekaufmanexpensify Thanks for pointing out that. But It seems this bug is out of scope of this PR, could you please create a new issue for it, because this PR has been delayed for long time and I believe we should merge it soon

cc @mountiny

@mountiny
Copy link
Contributor

@joekaufmanexpensify thanks for testing! We do indeed just update the report action which originally said the personal details need to be added. Do you suggest to maybe remove it when the details are added and add new one saying the details were added?

Then the next message is added when the card is shipped. I think here it's showing the workspace member because technically they initiated the shipping by adding the details.

I can fix the actor for the shipping message

Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

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

Thank you

@mountiny mountiny merged commit 5a8a260 into Expensify:main Feb 28, 2025
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.

@github-actions
Copy link
Contributor

github-actions bot commented Mar 3, 2025

🚀 Deployed to staging by https://github.com/mountiny in version: 9.1.8-0 🚀

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

@izarutskaya
Copy link

izarutskaya commented Mar 4, 2025

@github-actions
Copy link
Contributor

github-actions bot commented Mar 4, 2025

🚀 Deployed to production by https://github.com/puneetlath in version: 9.1.8-1 🚀

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

const expensifyCardLink =
shouldRenderHTML && shouldDisplayLinkToCard
? `<a href='${environmentURL}/${navigateRoute}'>${translateLocal('cardPage.expensifyCard')}</a>`
: translateLocal('cardPage.expensifyCard');
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like this caused a regression here: #68123
We failed to consider a case where the card is disabled.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants