Repository navigation
fix: resolve dupe button on one-expense report - #50133
Conversation
|
@sobitneupane 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] |
|
@daledah The "Review Duplicate" button remains visible even after one of the duplicate expenses is deleted. Steps to Reproduce:
Screen.Recording.2024-10-04.at.11.49.44.mov |
sobitneupane
left a comment
There was a problem hiding this comment.
|
@dannymcclain could you please review the screenshots attached above?
|
|
@sobitneupane Can you detail your steps in #50133 (comment)? I can't seem to replicate the exact condition as in your video. |
|
@daledah I can no longer reproduce the issue. I’ll follow up if I manage to replicate it again. |
|
The screenshots look a bit off to me. I think the On mobile, the buttons should be next to each other instead of stacked. cc'ing @dubielzyk-expensify & @JmillsExpensify for a gut check on all this. |
|
That looks right to me Danny! |
|
@daledah Are all the buttons consistent with what @dannymcclain posted? |
|
@pecanoro I'll update soon. |
|
@dannymcclain @pecanoro I updated |
|
Updated screenshots/videos are looking good. On mobile, it looks like there's a second or two when the report is loading that the big green button (Approve for example) is full-width, and then the Resolve duplicates button flashes in and the layout changes—is there any way to get rid of that jump or is it just a consequence of how we're loading the state of the report? Otherwise layout is looking good to me. |
|
@sobitneupane Ready for you to do another review! |
|
| ); | ||
|
|
||
| const shouldDuplicateButtonBeSuccess = useMemo( | ||
| () => isDuplicate && !shouldShowSettlementButton && !shouldShowExportIntegrationButton && !shouldShowSubmitButton && !hasAllPendingRTERViolations, |
There was a problem hiding this comment.
@sobitneupane I think submit button not being success-themed is expected:
App/src/components/MoneyReportHeader.tsx
Line 244 in 392d56a
There was a problem hiding this comment.
I believe so. In that case, should we have Review duplicates button success? cc: @dannymcclain
There was a problem hiding this comment.
🤔 Hmm, maybe? In this case I'm not sure. I don't think it's wrong to have two regular buttons here. But maybe @JmillsExpensify will have a better informed opinion on if the review duplicates button should be success colored in this situation.
There was a problem hiding this comment.
It's not wrong to have two regular buttons. This is the case of delayed submission being enabled, with a submission frequency set.
|
@sobitneupane I updated, please review again. |
|
@sobitneupane All yours! Please try to review it as soon as possible; thank you!! 🙇♀️ |
|
Sorry for the delay. I will try to get it done by EOD. |
There was a problem hiding this comment.
Screenshots/Videos
Android: Native
Screen.Recording.2024-10-16.at.17.25.59.mov
iOS: Native
Screen.Recording.2024-10-16.at.17.25.03.mov
iOS: mWeb Safari
Screen.Recording.2024-10-16.at.17.08.11.mov
MacOS: Chrome / Safari
Screen.Recording.2024-10-16.at.17.00.09.mov
MacOS: Desktop
Screen.Recording.2024-10-16.at.17.30.39.mov
|
Thanks for the update @daledah. The changes look good. However, it seems that the gap between the header and the |
|
@sobitneupane I updated. |
|
@sobitneupane If you can check the latest changes and complete the checklist today, it would be great! |
|
@daledah There are still some issues with the spacing on small screens. Let's make sure we avoid any unintended UI changes. |
|
@sobitneupane I updated. |
|
@daledah There is merge conflict. Can you please resolve it. |
|
@sobitneupane I updated. |
|
@daledah This issue is still reproducible. |
|
@sobitneupane I updated. |
sobitneupane
left a comment
There was a problem hiding this comment.
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 Issuessection 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
Testssection - I verified the steps for Staging and/or Production testing are in the
QA stepssection - 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 verified the steps for local testing are in the
- 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.
toggleReportand notonIconClick). - 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 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
- 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.
- 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 usingAvatarhave 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
thisproperly so there are no scoping issues (i.e. foronClick={this.submit}the methodthis.submitshould be bound tothisin the constructor) - Any internal methods bound to
thisare necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);ifthis.submitis never passed to a component event handler likeonClick) - 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(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
Avataris modified, I verified thatAvataris 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
Designlabel and/or tagged@Expensify/designso the design team can review the changes.
- If a new page is added, I verified it's using the
ScrollViewcomponent to make it scrollable when more elements are added to the page. - If the
mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps. - I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🚀 Deployed to staging by https://github.com/pecanoro in version: 9.0.51-1 🚀
|
|
🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.0.51-4 🚀
|
|
🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.0.51-4 🚀
|




















Details
Fixed Issues
$ #49793
PROPOSAL: #49793 (comment)
Tests
Precondition:
Steps:
Offline tests
QA Steps
Precondition:
Steps:
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)myBool && <MyComponent />.src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Screen.Recording.2024-10-03.at.15.45.13.mov
Android: mWeb Chrome
Screen.Recording.2024-10-03.at.15.46.21.mov
iOS: Native
Screen.Recording.2024-10-03.at.15.49.31.mov
iOS: mWeb Safari
Screen.Recording.2024-10-03.at.15.50.31.mov
MacOS: Chrome / Safari
Screen.Recording.2024-10-03.at.15.12.26.mp4
MacOS: Desktop
Screen.Recording.2024-10-03.at.15.54.12.mov