Workspace distance rate when offline #27870

tsa321 · 2023-09-20T14:57:14Z

Details

Fixed Issues

$ #26676
PROPOSAL: #26676 (comment)

Tests

While online go to reimbursement page and edit track distance rate
Go to preferences and turn offline mode on
Go to a workspace and select reimbursement
Click on rate in track distance and change the amount and click save
Again click on the rate and change the amount or unit to something else and click save
Go to preferences and toggle offline mode off
Go to the admin room of the workspace in step 3
Observe that there are only distance rate and unit update messages and must not be any update messages regarding pendingAction or errors of the Distance rate.

Verify that no errors appear in the JS console

Offline tests

QA Steps

While online go to reimbursement page and edit track distance rate
Go to preferences and turn offline mode on
Go to a workspace and select reimbursement
Click on rate in track distance and change the amount and click save
Again click on the rate and change the amount or unit to something else and click save
Go to preferences and toggle offline mode off
Go to the admin room of the workspace in step 3
Observe that there are only distance rate and unit update messages and must not be any update messages regarding pendingAction or errors of the Distance rate.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

macos_web_distance_d.mp4

Mobile Web - Chrome

android_mweb_distance_d.mp4

Mobile Web - Safari

ios_msafari_distance_d.mp4

Desktop

mac_desktop_distance_d.mp4

iOS

ios_distance_d.mp4

Android

android_native_d.mp4

Signed-off-by: Tsaqif <[email protected]>

melvin-bot · 2023-09-20T14:57:21Z

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

github-actions · 2023-09-20T14:57:31Z

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

tsa321 · 2023-09-20T14:58:11Z

I have read the CLA Document and I hereby sign the CLA

Signed-off-by: Tsaqif <[email protected]>

s77rt · 2023-09-20T15:04:43Z

src/libs/actions/Policy.js

@@ -714,13 +714,14 @@ function updateWorkspaceCustomUnitAndRate(policyID, currentCustomUnit, newCustom
        },
    ];

+    const newCustomUnitRateParam = _.omit(newCustomUnit.rates, ['pendingAction', 'errors']);
    API.write(
        'UpdateWorkspaceCustomUnitAndRate',
        {
            policyID,
            lastModified,
            customUnit: JSON.stringify(newCustomUnit),


I think we need to modify newCustomUnit too as it contains rates with the pendingAction errors fields

@s77rt Ok, I have add omitted the fields from newCustomUnit

Signed-off-by: Tsaqif <[email protected]>

s77rt · 2023-09-20T18:36:57Z

src/libs/actions/Policy.js

+    const newCustomUnitParam = _.omit(newCustomUnit, ['pendingAction', 'errors']);
+    const newCustomUnitRateParam = _.omit(newCustomUnit.rates, ['pendingAction', 'errors']);


Let's clone the newCustomUnit object and omit the .rates fields

const newCustomUnitParam = _.clone(newCustomUnit); newCustomUnitParam.rates = _.omit(newCustomUnitParam.rates, ['pendingAction', 'errors']);

Signed-off-by: Tsaqif <[email protected]>

s77rt · 2023-09-20T23:32:36Z

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 / Chrome
- iOS / native
- iOS / 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

Web

web.mov

Mobile Web - Chrome

mweb-chrome.mov

Mobile Web - Safari

mweb-safari.mov

Desktop

desktop.mov

iOS

ios.mov

Android

android.mov

s77rt · 2023-09-20T23:32:49Z

@tsa321 Please complete the checklist

tsa321 · 2023-09-20T23:43:11Z

@s77rt done...

deetergp

Looks good and tested well on web. Thanks!

tsa321 · 2023-09-25T02:33:42Z

@s77rt Is it normal that this PR hasn't been merged/deployed yet?

OSBotify · 2023-09-25T07:48:59Z

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

tsa321 · 2023-09-25T08:50:29Z

Thank you very much @deetergp

OSBotify · 2023-09-25T10:03:39Z

🚀 Deployed to staging by https://github.com/deetergp in version: 1.3.74-0 🚀

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

OSBotify · 2023-09-28T18:46:00Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 1.3.74-3 🚀

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

Fix issue of workspace distance rate when offline

232c6b3

Signed-off-by: Tsaqif <[email protected]>

tsa321 requested a review from a team as a code owner September 20, 2023 14:57

melvin-bot bot requested review from s77rt and removed request for a team September 20, 2023 14:57

remove space and revert naming variable

fbe8b0d

Signed-off-by: Tsaqif <[email protected]>

tsa321 marked this pull request as draft September 20, 2023 15:03

s77rt reviewed Sep 20, 2023

View reviewed changes

omiting some fields on customUnit too...

5733385

Signed-off-by: Tsaqif <[email protected]>

tsa321 marked this pull request as ready for review September 20, 2023 15:38

tsa321 requested a review from s77rt September 20, 2023 17:20

s77rt suggested changes Sep 20, 2023

View reviewed changes

clone newCustomUnit...

5420435

Signed-off-by: Tsaqif <[email protected]>

tsa321 requested a review from s77rt September 20, 2023 23:02

s77rt approved these changes Sep 20, 2023

View reviewed changes

melvin-bot bot requested a review from deetergp September 20, 2023 23:44

deetergp approved these changes Sep 21, 2023

View reviewed changes

deetergp merged commit f068ef1 into Expensify:main Sep 25, 2023
14 checks passed

This was referenced Sep 25, 2023

Deploy Checklist: New Expensify DUPE 2023-09-25 #28118

Closed

Deploy Checklist: New Expensify 2023-09-25 #28119

Closed

melvin-bot bot mentioned this pull request Sep 28, 2023

[HOLD for payment 2023-10-05] [$500] mWeb - Update message with empty values shown when changing track distance in offline mode more than once #26676

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Workspace distance rate when offline #27870

Workspace distance rate when offline #27870

tsa321 commented Sep 20, 2023 •

edited

Loading

melvin-bot bot commented Sep 20, 2023

github-actions bot commented Sep 20, 2023 •

edited

Loading

tsa321 commented Sep 20, 2023

s77rt Sep 20, 2023

tsa321 Sep 20, 2023

s77rt Sep 20, 2023

s77rt commented Sep 20, 2023 •

edited

Loading

s77rt commented Sep 20, 2023

tsa321 commented Sep 20, 2023

deetergp left a comment

tsa321 commented Sep 25, 2023

OSBotify commented Sep 25, 2023

tsa321 commented Sep 25, 2023

OSBotify commented Sep 25, 2023

OSBotify commented Sep 28, 2023

		const newCustomUnitParam = _.omit(newCustomUnit, ['pendingAction', 'errors']);
		const newCustomUnitRateParam = _.omit(newCustomUnit.rates, ['pendingAction', 'errors']);

Workspace distance rate when offline #27870

Workspace distance rate when offline #27870

Conversation

tsa321 commented Sep 20, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Sep 20, 2023

github-actions bot commented Sep 20, 2023 • edited Loading

tsa321 commented Sep 20, 2023

s77rt Sep 20, 2023

Choose a reason for hiding this comment

tsa321 Sep 20, 2023

Choose a reason for hiding this comment

s77rt Sep 20, 2023

Choose a reason for hiding this comment

s77rt commented Sep 20, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

s77rt commented Sep 20, 2023

tsa321 commented Sep 20, 2023

deetergp left a comment

Choose a reason for hiding this comment

tsa321 commented Sep 25, 2023

OSBotify commented Sep 25, 2023

tsa321 commented Sep 25, 2023

OSBotify commented Sep 25, 2023

OSBotify commented Sep 28, 2023

tsa321 commented Sep 20, 2023 •

edited

Loading

github-actions bot commented Sep 20, 2023 •

edited

Loading

s77rt commented Sep 20, 2023 •

edited

Loading