Skip to content

Move selected transactions #61839

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

Merged

Conversation

jnowakow
Copy link
Contributor

@jnowakow jnowakow commented May 12, 2025

Explanation of Change

Fixed Issues

$ #61770
PROPOSAL: N/A

Tests

  1. Create at least two reports.
  2. Add some expenses to one of them.
  3. Select at least one expense.
  4. Click "X Selected" -> "Move transactions"
  5. Select second report
  • Verify that no errors appear in the JS console

Offline tests

  1. Create at least two reports.
  2. Add some expenses to one of them.
  3. Select at least one expense.
  4. Click "X Selected" -> "Move transactions"
  5. Select second report

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

  1. Create at least two reports.
  2. Add some expenses to one of them.
  3. Select at least one expense.
  4. Click "X Selected" -> "Move transactions"
  5. Select second report
  • 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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • 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 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 used JaimeGPT to get English > Spanish translation. I then posted it 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 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
  • 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.ts 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 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 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 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 Design label and/or tagged @Expensify/design so the design team can review the changes.
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • 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.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
android-web.mov
iOS: Native
iOS: mWeb Safari
ios.mov
MacOS: Chrome / Safari
web.mov
MacOS: Desktop

@jnowakow jnowakow requested a review from a team as a code owner May 12, 2025 08:32
@jnowakow jnowakow marked this pull request as draft May 12, 2025 08:33
@melvin-bot melvin-bot bot requested review from MarioExpensify and removed request for a team May 12, 2025 08:33
Copy link

melvin-bot bot commented May 12, 2025

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

@jnowakow jnowakow changed the title Add screen - not working Move selected transactions May 12, 2025
@jnowakow
Copy link
Contributor Author

jnowakow commented May 12, 2025

@waterim I used your implementation here and move UI to separate component. I think you'll work on follow up so please don't be surprised 😅

@sumo-slonik I slightly modified logic here so please take a look 😇

cc @luacmartins

@jnowakow
Copy link
Contributor Author

@waterim I made a mistake and wrote that I'll work on follow up 😅 I think you're the one who's doing it so I don't want to interfere 😅 but of course I can help with it :D

@jnowakow jnowakow marked this pull request as ready for review May 12, 2025 15:36
@jnowakow jnowakow requested a review from a team as a code owner May 12, 2025 15:36
const policyID = policyIDToCheck ?? getPolicyIDFromState(navigationRef.getRootState() as State<RootNavigatorParamList>);
const policyMemberAccountIDs = getPolicyEmployeeAccountIDs(policyID);
const shouldOpenAllWorkspace = isEmptyObject(targetReport) ? true : !doesReportBelongToWorkspace(targetReport, policyMemberAccountIDs, policyID);
isNavigationReady().then(() => {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This change was approved by @WojtekBoman himself 🙇

Copy link
Contributor

Choose a reason for hiding this comment

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

the man, the legend

Copy link
Contributor

@luacmartins luacmartins left a comment

Choose a reason for hiding this comment

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

Looking good. Left a few minor comments

Copy link
Contributor

Choose a reason for hiding this comment

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

This asset doesn't seem to follow the same pattern as others. @jnowakow did you just extract it directly from figma?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes and then I removed attributes that were not present in assets/images/document-plus.svg

Copy link
Contributor Author

@jnowakow jnowakow May 12, 2025

Choose a reason for hiding this comment

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

image

In App it looks good

Copy link
Contributor

Choose a reason for hiding this comment

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

I think we have a different process to export these assets. @Expensify/design could you please assist?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah, who exported this? Did it come from the design team or not?

Copy link
Contributor

Choose a reason for hiding this comment

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

Try this one: document-move.svg.zip

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah, who exported this? Did it come from the design team or not?

I don't think so, I think @jnowakow just got it from figma

Copy link
Contributor

Choose a reason for hiding this comment

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

Is this addressed @jnowakow?

options.push({
text: 'Move Expenses',
icon: Expensicons.DocumentMerge,
value: 'MOVE',
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's use a const for this, probably declared in CONST.REPORT.SECONDARY_ACTIONS.MOVE_TRANSACTIONS

Copy link
Contributor Author

@jnowakow jnowakow May 12, 2025

Choose a reason for hiding this comment

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

I'll declare it as const on top of the file because it's ignored anyway

const policyID = policyIDToCheck ?? getPolicyIDFromState(navigationRef.getRootState() as State<RootNavigatorParamList>);
const policyMemberAccountIDs = getPolicyEmployeeAccountIDs(policyID);
const shouldOpenAllWorkspace = isEmptyObject(targetReport) ? true : !doesReportBelongToWorkspace(targetReport, policyMemberAccountIDs, policyID);
isNavigationReady().then(() => {
Copy link
Contributor

Choose a reason for hiding this comment

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

the man, the legend


function IOURequestEditReportCommon({backTo, transactionReport, selectReport}: Props) {
const {translate} = useLocalize();
const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {selector: (c) => mapOnyxCollectionItems(c, reportSelector), canBeMissing: true});
Copy link
Contributor

Choose a reason for hiding this comment

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

I know this is not your code, but what is c? Can we use a better variable name in this case?

@jnowakow jnowakow requested a review from luacmartins May 12, 2025 17:35
@shawnborton
Copy link
Contributor

Where do we have the most up-to-date videos for review? Otherwise we can make a test build when this is ready too. Just let us know!

Copy link
Contributor

🚧 @luacmartins has triggered a test app build. You can view the workflow run here.

This comment has been minimized.

@shawnborton
Copy link
Contributor

Hmm at this specific breakpoint, should we be showing checkboxes? I would think not, right?
CleanShot 2025-05-12 at 17 17 33@2x

I would think at that point we just mirror mobile styles:
CleanShot 2025-05-12 at 17 18 08@2x

@shawnborton
Copy link
Contributor

I can see the option to move an expense on a report that is already approved/paid, but when I try to move it, I see "not found" in the RHP:
CleanShot 2025-05-12 at 17 18 32@2x

Copy link
Contributor

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖 iOS 🍎
Android 🤖🔄 iOS 🍎🔄
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/61839-hybrid/index.html https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/61839-hybrid/index.html
Android iOS
Desktop 💻 Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/61839/NewExpensify.dmg https://61839.pr-testing.expensify.com
Desktop Web

👀 View the workflow run that generated this build 👀

@luacmartins
Copy link
Contributor

luacmartins commented May 13, 2025

before first approval

@jnowakow we have this method that might be useful here -

function isAwaitingFirstLevelApproval(report: OnyxEntry<Report>): boolean {

@allgandalf
Copy link
Contributor

allgandalf commented May 14, 2025

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 that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • 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 there are no new alerts related to the canBeMissing param for useOnyx
  • 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 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
  • 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.ts 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(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 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 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 Design label and/or tagged @Expensify/design so the design team can review the changes.
  • 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.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • 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: HybridApp
Screen.Recording.2025-05-14.at.9.51.18.AM.mov
Android: mWeb Chrome
Screen.Recording.2025-05-14.at.9.52.28.AM.mov
iOS: HybridApp
Screen.Recording.2025-05-14.at.9.43.43.AM.mov
iOS: mWeb Safari
Screen.Recording.2025-05-14.at.9.45.54.AM.mov
MacOS: Chrome / Safari
Screen.Recording.2025-05-14.at.9.40.15.AM.mov
MacOS: Desktop
Screen.Recording.2025-05-14.at.9.39.01.AM.mov

Copy link
Contributor

@allgandalf allgandalf left a comment

Choose a reason for hiding this comment

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

nit picks, will go forward with platform testing now

@@ -1212,6 +1212,7 @@ const translations = {
dates: 'Fechas',
rates: 'Tasas',
submitsTo: ({name}: SubmitsToParams) => `Se envía a ${name}`,
moveExpenses: () => ({one: 'Mover gasto', other: 'Mover gastos'}),
Copy link
Contributor

Choose a reason for hiding this comment

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

are these translations confirmed

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, by JamieGPT. I've posted to slack channel here

@allgandalf
Copy link
Contributor

Bug: There is a move expense option even when the policy chat has only one report:

Screen.Recording.2025-05-14.at.9.53.55.AM.mov

I think the button should be hidden if there is only a single report. thoughts @trjExpensify @luacmartins

@allgandalf
Copy link
Contributor

bug: submitted expense has move expense option, nothing happens when we click on it:

Screen.Recording.2025-05-14.at.9.56.24.AM.mov

@jnowakow
Copy link
Contributor Author

Bug: There is a move expense option even when the policy chat has only one report:

It was done this way before so I didn't alter this behaviour

@jnowakow
Copy link
Contributor Author

bug: submitted expense has move expense option, nothing happens when we click on it:

I can't reproduce this one
image

Copy link
Contributor

@allgandalf allgandalf left a comment

Choose a reason for hiding this comment

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

I also cannot reproduce the second bug with new report! thanks

@jnowakow
Copy link
Contributor Author

@luacmartins @trjExpensify should it be possible to move all expenses from submitted report? It leads to situation where there's a report without expenses and there's no option to add expense to it

Screen.Recording.2025-05-14.at.10.50.16.mov

@jnowakow
Copy link
Contributor Author

Ahh okey after #61465 is merged it will be possible to bring expenses back but this submitted $0.00 looks strange and there's no button above 🤔
image

@shawnborton
Copy link
Contributor

Hmm interesting, I would think that in that case above, we should probably just delete the report since it no longer has expenses on it? Curious what Tom thinks though.

@dannymcclain
Copy link
Contributor

Hmm interesting, I would think that in that case above, we should probably just delete the report since it no longer has expenses on it? Curious what Tom thinks though.

Yeah, it seems pretty unlikely that someone is going to move all expenses off a report and then add new ones to that old report? Curious what Tom thinks though for sure.

@luacmartins
Copy link
Contributor

@luacmartins @trjExpensify should it be possible to move all expenses from submitted report? It leads to situation where there's a report without expenses and there's no option to add expense to it

Yea, this is possible.

I would think that in that case above, we should probably just delete the report since it no longer has expenses on it?

We don't do this in OldDot, so I don't think we should start it now. Let's just keep the empty report.

MarioExpensify
MarioExpensify previously approved these changes May 14, 2025
Copy link
Contributor

@MarioExpensify MarioExpensify left a comment

Choose a reason for hiding this comment

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

LGTM!

luacmartins
luacmartins previously approved these changes May 14, 2025
Copy link
Contributor

@luacmartins luacmartins left a comment

Choose a reason for hiding this comment

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

LGTM

Comment on lines +332 to +334
const canMoveExpense = canEditFieldOfMoneyRequest(iouReportAction, CONST.EDIT_REQUEST_FIELD.REPORT);

return canMoveExpense;
Copy link
Contributor

Choose a reason for hiding this comment

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

NAB

Suggested change
const canMoveExpense = canEditFieldOfMoneyRequest(iouReportAction, CONST.EDIT_REQUEST_FIELD.REPORT);
return canMoveExpense;
return canEditFieldOfMoneyRequest(iouReportAction, CONST.EDIT_REQUEST_FIELD.REPORT);

@luacmartins
Copy link
Contributor

@jnowakow we have conflicts

@jnowakow jnowakow dismissed stale reviews from luacmartins and MarioExpensify via 2183b33 May 15, 2025 09:17
@jnowakow
Copy link
Contributor Author

@luacmartins conflicts solved

Copy link
Contributor

@luacmartins luacmartins left a comment

Choose a reason for hiding this comment

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

LGTM

@luacmartins luacmartins merged commit 5aa3ba0 into Expensify:main May 15, 2025
16 checks passed
@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.

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.

8 participants