Fix/30378: Update correct pendingFields #31172

DylanDylann · 2023-11-10T09:48:05Z

Details

Update pending fields for failure data
Update correct pendingFields in saveWaypoint Function

Fixed Issues

$ #30378
PROPOSAL: #30378 (comment)

Tests

Create a new Distance Request (leave description empty)
Go to a workspace distance request details page
Go offline
Verify that the description row is not grayed out

Verify that no errors appear in the JS console

Offline tests

Same above

QA Steps

Create a new Distance Request (leave description empty)
Go to a workspace distance request details page
Go offline
Verify that the description row is not grayed out

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 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
  - If any non-english text was added/modified, I verified the translation was requested/reviewed 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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
  - 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(themeColors.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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Screencast.from.14-11-2023.02.45.26.webm

Android: mWeb Chrome

Screencast.from.14-11-2023.02.54.05.webm

iOS: Native

Screencast.from.14-11-2023.02.21.01.webm

iOS: mWeb Safari

Screencast.from.14-11-2023.02.26.06.webm

MacOS: Chrome / Safari

Screencast.from.14-11-2023.02.02.07.webm

MacOS: Desktop

Screencast.from.14-11-2023.02.05.08.webm

DylanDylann · 2023-11-10T09:53:39Z

src/libs/actions/Transaction.ts

@@ -59,7 +59,7 @@ function addStop(transactionID: string) {
 function saveWaypoint(transactionID: string, index: string, waypoint: RecentWaypoint | null, isEditingWaypoint = false) {
    Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {
        pendingFields: {
-            comment: isEditingWaypoint ? CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE : CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+            waypoints: isEditingWaypoint ? CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE : CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,


In here we should update pendingFields.waypoints like we did when changing waypoint in EditRequestPage

App/src/libs/actions/IOU.js

Line 689 in 0888bda

const pendingFields = _.mapObject(transactionChanges, () => CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);

I log pendingFields here anh Let's see this video

Screen-Recording-2023-11-10-at-14.57.38.mp4

melvin-bot · 2023-11-13T19:57:55Z

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

ArekChr · 2023-11-14T11:33:42Z

tests/actions/IOUTest.js

@@ -686,7 +686,7 @@ describe('actions/IOU', () => {
                                    waitForCollectionCallback: true,
                                    callback: (transaction) => {
                                        Onyx.disconnect(connectionID);
-                                        expect(transaction.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                        expect(transaction.pendingAction).toBeFalsy();


Why the pending action changed to false instead of add?

@ArekChr In this UT case, there are some errors while creating transaction. We removed pendingAction in FailureData in the logic so we also need to update UTs here

DylanDylann · 2023-11-15T05:23:32Z

We have updated author checklist template, but the automated GH Action doesn't work on this PR. I updated template manually. But PR Author Checklist / checklist (pull_request) still fail

ArekChr · 2023-11-15T10:59:25Z

Hi @DylanDylann, I've encountered an issue where the 'distance request' option becomes greyed out when I go offline, comparing to staging there is no such case. Could you please investigate this?

DylanDylann · 2023-11-16T04:23:39Z

@ArekChr Updated. We need to clear pendingFields in sucessData and FailureData

ArekChr · 2023-11-16T10:32:48Z

Testing

ArekChr · 2023-11-16T11:35:13Z

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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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(themeColors.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 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

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

OSBotify · 2023-11-16T22:25:13Z

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

bondydaa · 2023-11-21T19:47:13Z

looks like this regression is related #31639 (comment)

OSBotify · 2023-11-22T00:50:09Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.4.1-13 🚀

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

update correct pendingFields

3ff8093

DylanDylann commented Nov 10, 2023

View reviewed changes

DylanDylann added 4 commits November 10, 2023 17:06

update correct pendingFields

1f75c95

merge main

3a9c613

fix test

4043d4f

fix test

1147862

DylanDylann marked this pull request as ready for review November 13, 2023 19:57

DylanDylann requested a review from a team as a code owner November 13, 2023 19:57

melvin-bot bot removed the request for review from a team November 13, 2023 19:57

melvin-bot bot requested a review from ArekChr November 13, 2023 19:57

ArekChr reviewed Nov 14, 2023

View reviewed changes

clear pendingFields

4516ed2

fix lint

1b7fc3a

ArekChr approved these changes Nov 16, 2023

View reviewed changes

melvin-bot bot requested a review from cead22 November 16, 2023 11:35

cead22 approved these changes Nov 16, 2023

View reviewed changes

cead22 merged commit 235ede8 into Expensify:main Nov 16, 2023

os-botify bot mentioned this pull request Nov 20, 2023

Deploy Checklist: New Expensify 2023-11-20 #31556

Closed

90 tasks

bernhardoj mentioned this pull request Nov 21, 2023

IOU - Chat row with a red dot in LHN is not grayed out when money request fails #31639

Closed

6 tasks

mallenexpensify mentioned this pull request Jan 3, 2024

[$500] Distance - Empty description row is grayed out in offline mode #30378

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix/30378: Update correct pendingFields #31172

Fix/30378: Update correct pendingFields #31172

DylanDylann commented Nov 10, 2023 •

edited

Loading

DylanDylann Nov 10, 2023

melvin-bot bot commented Nov 13, 2023

ArekChr Nov 14, 2023

DylanDylann Nov 15, 2023 •

edited

Loading

DylanDylann commented Nov 15, 2023

ArekChr commented Nov 15, 2023 •

edited

Loading

DylanDylann commented Nov 16, 2023

ArekChr commented Nov 16, 2023

ArekChr commented Nov 16, 2023

OSBotify commented Nov 16, 2023

bondydaa commented Nov 21, 2023

OSBotify commented Nov 22, 2023

Fix/30378: Update correct pendingFields #31172

Fix/30378: Update correct pendingFields #31172

Conversation

DylanDylann commented Nov 10, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

DylanDylann Nov 10, 2023

Choose a reason for hiding this comment

melvin-bot bot commented Nov 13, 2023

ArekChr Nov 14, 2023

Choose a reason for hiding this comment

DylanDylann Nov 15, 2023 • edited Loading

Choose a reason for hiding this comment

DylanDylann commented Nov 15, 2023

ArekChr commented Nov 15, 2023 • edited Loading

DylanDylann commented Nov 16, 2023

ArekChr commented Nov 16, 2023

ArekChr commented Nov 16, 2023

Reviewer Checklist

Screenshots/Videos

OSBotify commented Nov 16, 2023

bondydaa commented Nov 21, 2023

OSBotify commented Nov 22, 2023

DylanDylann commented Nov 10, 2023 •

edited

Loading

DylanDylann Nov 15, 2023 •

edited

Loading

ArekChr commented Nov 15, 2023 •

edited

Loading