Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Save button for rate and unit #18454

Merged
merged 21 commits into from
May 25, 2023

Conversation

ShogunFire
Copy link
Contributor

@ShogunFire ShogunFire commented May 4, 2023

Details

The way to change rate and unit was kind of broken so we decided to regroup the two calls of the API in one and to do this call when we clickon a save button. the rate and unit are now in a different page than the reimburse page.

Fixed Issues

$ 15996
PROPOSAL: 15996 (COMMENT)

Tests

  1. Go to Settings > Workspace > choose or create a workspace >Reimburse expenses
  2. Check that the track distance section looks good and display the rate correctly
  3. Click on the rate
  4. Change the rate and the unit
  5. Check that you can't save a wrong rate
  6. Check that when you save you are brought back to the Reimburse expenses page and that the rate/unit has changed
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  1. Go to Settings > Workspace > choose or create a workspace >Reimburse expenses
  2. Check that the track distance section looks good and display the rate correctly
  3. Click on the rate
  4. Change the rate and the unit
  5. Check that you can't save a wrong rate
  6. Check that when you save you are brought back to the Reimburse expenses page and that the rate/unit has changed
  • 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 / 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 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
    • 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 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

Web
2023-05-05.18-42-12.mp4
Mobile Web - Chrome
2023-05-05.22-32-18.mp4
Mobile Web - Safari
2023-05-05.20-43-58.mp4
Desktop
2023-05-05.20-52-07.mp4
iOS
2023-05-05.20-34-17.mp4
Android
2023-05-05.22-20-24.mp4

…calls

Signed-off-by: Pierre Michel <pmiche04@gmail.com>
@ShogunFire ShogunFire requested a review from a team as a code owner May 4, 2023 22:35
@melvin-bot melvin-bot bot requested review from youssef-lr and removed request for a team May 4, 2023 22:35
@melvin-bot
Copy link

melvin-bot bot commented May 4, 2023

@youssef-lr 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]

@ShogunFire
Copy link
Contributor Author

Hello @eVoloshchak this is what I have done for the moment, you can see how that looks like with my web recording. I am going to correct little things here and there but I wonder how you would go about doing what you spoke about with the designer (aligning "Rate" with the text and making sure the hover state touches the border, I am guessing you did this by changing the css directly in chrome:
235514530-ccfce9a7-0f6e-47c6-9234-9fc315b7fe05

So to get the same result I am guessing that I have to remove the padding of Section and add margin to the texts above "Rate", I wonder how to do that without having ugly code, do you have an idea ? Should I still use Section or just copy it's style ?

…t, guide management,rate display in the reimburse screen
Signed-off-by: Pierre Michel <pmiche04@gmail.com>
@eVoloshchak
Copy link
Contributor

So to get the same result I am guessing that I have to remove the padding of Section and add margin to the texts above "Rate", I wonder how to do that without having ugly code, do you have an idea ? Should I still use Section or just copy it's style ?

No need to change the section I think, I just used negative values for margin, passing inputStyle to TextInput

…kilometer

Signed-off-by: Pierre Michel <pmiche04@gmail.com>
Signed-off-by: Pierre Michel <pmiche04@gmail.com>

# Conflicts:
#	src/libs/actions/Policy.js
Signed-off-by: Pierre Michel <pmiche04@gmail.com>
Signed-off-by: Pierre Michel <pmiche04@gmail.com>
@ShogunFire
Copy link
Contributor Author

ShogunFire commented May 6, 2023

Thanks @eVoloshchak , yes negative margin worked. I think everything is good now

Signed-off-by: Pierre Michel <pmiche04@gmail.com>
@ShogunFire
Copy link
Contributor Author

@eVoloshchak thanks, I did the suggestions

src/pages/workspace/reimburse/WorkspaceReimburseView.js Outdated Show resolved Hide resolved
src/pages/workspace/reimburse/WorkspaceReimburseView.js Outdated Show resolved Hide resolved
src/pages/workspace/reimburse/WorkspaceReimburseView.js Outdated Show resolved Hide resolved
src/languages/es.js Outdated Show resolved Hide resolved
src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js Outdated Show resolved Hide resolved
src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js Outdated Show resolved Hide resolved
src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js Outdated Show resolved Hide resolved
src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js Outdated Show resolved Hide resolved
src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.js Outdated Show resolved Hide resolved
Signed-off-by: Pierre Michel <pmiche04@gmail.com>
Signed-off-by: Pierre Michel <pmiche04@gmail.com>
Signed-off-by: Pierre Michel <pmiche04@gmail.com>

# Conflicts:
#	src/ROUTES.js
#	src/libs/actions/Policy.js
#	src/pages/workspace/reimburse/WorkspaceReimburseView.js
Signed-off-by: Pierre Michel <pmiche04@gmail.com>
Signed-off-by: Pierre Michel <pmiche04@gmail.com>
Signed-off-by: Pierre Michel <pmiche04@gmail.com>
@eVoloshchak
Copy link
Contributor

eVoloshchak commented May 17, 2023

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 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
Screen.Recording.2023-05-23.at.20.25.34.mov
Mobile Web - Chrome
Screen_Recording_20230523-203407_Chrome.mp4
Mobile Web - Safari
Screen.Recording.2023-05-23.at.20.28.18.mov
Desktop
Screen.Recording.2023-05-23.at.20.34.36.mov
iOS
Screen.Recording.2023-05-23.at.20.29.40.mov
Android
Screen_Recording_20230523-203243_New.Expensify.mp4

@eVoloshchak
Copy link
Contributor

@ShogunFire, this looks good, tested well on all platforms

  • Please merge with main

  • I've found a small bug with localized decimal separator

Screen.Recording.2023-05-17.at.17.58.07.mov
  1. Change language to Spanish
  2. Go to the "Reimburse expenses" page
  3. Notice how the decimal separator is still dot (.), while it should be comma (,) when Spanish is selected

joelbettner
joelbettner previously approved these changes May 23, 2023
@joelbettner
Copy link
Contributor

@youssef-lr all yours.

@eVoloshchak
Copy link
Contributor

@ShogunFire, this branch has conflicts that must be resolved

youssef-lr
youssef-lr previously approved these changes May 24, 2023
Copy link
Contributor

@youssef-lr youssef-lr left a comment

Choose a reason for hiding this comment

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

LGTM!

@youssef-lr
Copy link
Contributor

@ShogunFire there are conflicts.

Signed-off-by: Pierre Michel <pmiche04@gmail.com>

# Conflicts:
#	src/libs/actions/Policy.js
@ShogunFire
Copy link
Contributor Author

@youssef-lr Conflicts solved

@youssef-lr youssef-lr merged commit 73901b9 into Expensify:main May 25, 2023
@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.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/youssef-lr in version: 1.3.19-0 🚀

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

@trjExpensify
Copy link
Contributor

👋 #19685 (comment) - regression?

@ShogunFire
Copy link
Contributor Author

@eVoloshchak :( Looks like there are some changes to do, do you know if there is a way to do only one PR for all those changes ? Or even reopen this PR ? Those are little changes and I don't know if it's worth 3 PR.

@youssef-lr
Copy link
Contributor

@ShogunFire You can create another PR to fix the regression and pull me for review.

@sakluger
Copy link
Contributor

Looks like there's another regression related to how the field diplays while offline #19702.

@situchan
Copy link
Contributor

#19704 will also be fixed in a follow-up PR?

@ShogunFire
Copy link
Contributor Author

@youssef-lr @eVoloshchak So I have done 3 PR to solve the three bugs but @luacmartins has made a PR that resolves the 3 and some others I think. I thought I was supposed to fix the regressions but I am ok if we take his, less work for me :P

@luacmartins
Copy link
Contributor

@ShogunFire Yes, normally you should fix your regressions. I just did it now because it was a deploy blocker linked to it and it was easier to CP that to staging instead of 3 different PRs. I also added an extra fix for it.

@ShogunFire
Copy link
Contributor Author

Ok thank you.

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/luacmartins in version: 1.3.19-7 🚀

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

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.

9 participants