Skip to content

Conversation

@FitseTLT
Copy link
Contributor

Details

When updating snapshots from BE response we used to only pick existing props in the snapshot from the update object data but there are cases where the BE can add new props that didn't exist in the snapshot data so in this PR we are removing the picking.

Related Issues

Expensify/App#60116

Automated Tests

Manual Tests

Go to node_modules react-native-onyx and update this line

updatedData = {...updatedData, [key]: Object.assign(oldValue, newValue)};

to

            updatedData = Object.assign(Object.assign({}, updatedData), { [key]: Object.assign(oldValue, value) });

Precondition: a workspace has an employee with an expense without receipt

  1. From the admin side click on Reports tab
  2. From the employee side Click on Reports tab
  3. Click on expense without receipt
  4. Upload image for this expense
  5. From the admin side
  6. Expected Result:
  7. The uploaded image should be displayed

Author Checklist

  • I linked the correct issue in the ### Related 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 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 / Chrome
    • iOS / native
    • iOS / 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 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 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.js 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 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
    • If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
    • 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 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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native
2025-05-27.00-20-02.mp4
Android: mWeb Chrome
2025-05-27.00-20-33.mp4
iOS: Native
2025-05-26.22-59-26.mp4
iOS: mWeb Safari
2025-05-26.23-01-47.mp4
MacOS: Chrome / Safari
2025-05-26.22-57-34.mp4
MacOS: Desktop
2025-05-26.22-58-36.mp4

@FitseTLT FitseTLT requested a review from a team as a code owner May 26, 2025 21:21
@melvin-bot melvin-bot bot requested review from Valforte and removed request for a team May 26, 2025 21:22
@FitseTLT
Copy link
Contributor Author

Requesting review from @parasharrajat and @iwiznia

@FitseTLT FitseTLT changed the title remove picking only existing props updateSnapshots - remove picking only existing props May 26, 2025
@parasharrajat
Copy link
Member

parasharrajat commented May 26, 2025

@FitseTLT Could you please update the tests for snapshots?

@FitseTLT
Copy link
Contributor Author

@FitseTLT Could you please update the tests for snapshots?

What do you mean? @parasharrajat

@parasharrajat
Copy link
Member

I mean to ask for updating the unit tests around the snapshots as we changed the functionality and Onyx is core lib so it is important we keep full coverage.

iwiznia
iwiznia previously approved these changes May 27, 2025
Copy link
Contributor

@iwiznia iwiznia left a comment

Choose a reason for hiding this comment

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

Looks good to me, but agree on adding tests

@FitseTLT
Copy link
Contributor Author

Added @parasharrajat

Copy link
Member

@parasharrajat parasharrajat left a comment

Choose a reason for hiding this comment

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

LGTM.


const initialValue = {name: 'Fluffy'};
const finalValue = {name: 'Kitty'};
const finalValue = {name: 'Kitty', nickName: 'Fitse'};
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't quite get it, how is this change exercising the changed code?

Copy link
Member

Choose a reason for hiding this comment

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

Earlier, if we couldn't add new keys(change the Object structure) to the existing values in snapshots in Onyx. But now we can do that. Here in this test, a new key is now added which confirms that change work and allows adding new keys to the existing items in snapshots.

@iwiznia

Copy link
Contributor Author

Choose a reason for hiding this comment

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

nickName is a new prop that didn't exist in intialValue. Evidence: if u test it on main it will fail.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah got it! Thanks for clarifying

@iwiznia iwiznia merged commit 98bd0fe into Expensify:main May 28, 2025
5 checks passed
@os-botify
Copy link
Contributor

os-botify bot commented May 28, 2025

🚀 Published to npm in 2.0.108 🎉

@FitseTLT FitseTLT mentioned this pull request Aug 8, 2025
42 tasks
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