Skip to content

Revert "fix: After clearing merchant and saving it, Merchant field reverts to previous value #63587"#66082

Merged
luacmartins merged 2 commits intomainfrom
revert-64761-fix/63587
Jul 14, 2025
Merged

Revert "fix: After clearing merchant and saving it, Merchant field reverts to previous value #63587"#66082
luacmartins merged 2 commits intomainfrom
revert-64761-fix/63587

Conversation

@luacmartins
Copy link
Copy Markdown
Contributor

@luacmartins luacmartins commented Jul 14, 2025 •
edited
Loading

Explanation of Change

Straight revert of #64761 and #66062

Fixed Issues

$ #65975
$ #65974

Tests

Case 1

  1. Submit two expenses with description and merchant to the user.
  2. Open expense report.
  3. Open any expense row.
  4. Click Merchant.
  5. Clear the merchant and save it.

Case 2

  1. Submit an expense with merchant to the user
  2. Go to Reports > Expenses
  3. Click on the expense row
  4. Click Merchant
  5. Clear the merchant and save it
  • Verify that no errors appear in the JS console

Offline tests

Same as QA Steps

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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • 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

Screen.Recording.2025-07-14.at.1.26.45.PM.mov
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop

@luacmartins luacmartins self-assigned this Jul 14, 2025
@luacmartins luacmartins marked this pull request as ready for review July 14, 2025 19:27
@luacmartins luacmartins requested a review from a team as a code owner July 14, 2025 19:27
@melvin-bot melvin-bot bot requested review from ishpaul777 and removed request for a team July 14, 2025 19:27
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Jul 14, 2025

@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
Copy link
Copy Markdown
Contributor

ishpaul777 commented Jul 14, 2025

@luacmartins does this requires c+ review ?

@mananjadhav
Copy link
Copy Markdown
Collaborator

mananjadhav commented Jul 14, 2025

@luacmartins I was the C+ of the original issue, do you want me to review it as a part of the regression?

@pecanoro
Copy link
Copy Markdown
Contributor

pecanoro commented Jul 14, 2025

This was reverted already here #66062, am I missing something?

@pecanoro
Copy link
Copy Markdown
Contributor

pecanoro commented Jul 14, 2025

Oh, that was a fix not a revert

@pecanoro
Copy link
Copy Markdown
Contributor

pecanoro commented Jul 14, 2025

@luacmartins But I am still a bit confused. Didn't the PR fix it?

@luacmartins
Copy link
Copy Markdown
Contributor Author

luacmartins commented Jul 14, 2025

@pecanoro there are 2 bugs and the PR fixing it fixed one of the bugs, but not the other. I don't think we want to CP yet another fix for this, especially since the fix would involve a BE update to the SearchTransaction key. So I'm opting for a revert

@luacmartins
Copy link
Copy Markdown
Contributor Author

luacmartins commented Jul 14, 2025

Straight revert

@luacmartins luacmartins merged commit 73c50d5 into main Jul 14, 2025
25 of 28 checks passed
@luacmartins luacmartins deleted the revert-64761-fix/63587 branch July 14, 2025 23:08
@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Jul 14, 2025

✋ 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 pushed a commit that referenced this pull request Jul 15, 2025
@luacmartins @OSBotify
Merge pull request #66082 from Expensify/revert-64761-fix/63587
ac5b7c3 
Revert "fix: After clearing merchant and saving it, Merchant field reverts to previous value #63587"

(cherry picked from commit 73c50d5)

(cherry-picked to staging by luacmartins)
@OSBotify OSBotify added the CP Staging marks PRs that have been CP'd to staging label Jul 15, 2025
@github-actions github-actions bot mentioned this pull request Jul 15, 2025
Closed
73 tasks
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Jul 15, 2025

🚀 Cherry-picked to staging by https://github.com/luacmartins in version: 9.1.80-8 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Jul 15, 2025

🚀 Deployed to production by https://github.com/luacmartins in version: 9.1.80-8 🚀

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

This was referenced Jul 15, 2025
Closed
Closed
@BlameGPT BlameGPT mentioned this pull request Jul 15, 2025
Closed
8 tasks
@Julesssss Julesssss mentioned this pull request Jul 15, 2025
Closed
68 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JS00001 JS00001 JS00001 approved these changes

@ishpaul777 ishpaul777 Awaiting requested review from ishpaul777

Assignees

@luacmartins luacmartins

Labels

CP Staging marks PRs that have been CP'd to staging

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@luacmartins @ishpaul777 @mananjadhav @pecanoro @OSBotify @JS00001