Tweaks to the expense flow #53760

JKobrynski · 2024-12-09T15:16:03Z

Explanation of Change

Implement the requirements specified in this comment

FYI

Screen title changes that were specified in the above comment were already implemented thus they are not included in this PR.

Fixed Issues

$ #52981
PROPOSAL: N/A

Tests

Log into the app
Click on the + button
Select the Create expense option
Choose the Manual expense
Provide an expense value
Navigate to the next step
Make sure the Just track it (don't submit it) option row is not visible
Verify if there is a Workspace and Personal section
Test if you can submit an expenses to workspaces, recents, contacts and to yourself
Verify the button on the Confirm details screen says "Create amount expense"

Verify that no errors appear in the JS console

Offline tests

Same as Tests section above

QA Steps

Same as Tests section above

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android-compressed.webm

Android: mWeb Chrome

chrome-compressed.webm

iOS: Native

ios-compressed.mp4

iOS: mWeb Safari

safari-compressed.mp4

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-12-10T16:12:11Z

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

src/languages/es.ts

src/libs/OptionsListUtils.ts

github-actions · 2024-12-11T12:59:01Z

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

github-actions · 2024-12-11T13:25:56Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/53760/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/53760/index.html

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/53760/NewExpensify.dmg	https://53760.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

…aks-to-create-expense-flow

shawnborton · 2024-12-11T19:04:49Z

@trjExpensify is there a separate PR that just gets rid of the Track & Submit options and replaces it with the Create flow? Wasn't sure if we were doing that here or elsewhere. cc @anmurali for thoughts too

shawnborton · 2024-12-11T19:06:11Z

Idea for the future: whenever we have the "Default" badge for the default workspace in the Workspaces list from Settings, we should consider adding it here too on the right side of the workspace row?

trjExpensify · 2024-12-12T08:53:03Z

That's a neat idea!

trjExpensify · 2024-12-12T08:53:42Z

@trjExpensify is there a separate PR that just gets rid of the Track & Submit options and replaces it with the Create flow? Wasn't sure if we were doing that here or elsewhere. cc @anmurali for thoughts too

Separate PR & issue here: #53952

…aks-to-create-expense-flow

trjExpensify · 2024-12-12T23:01:19Z

@JKobrynski is this ready for a re-review?

JKobrynski · 2024-12-12T23:03:33Z

@trjExpensify not yet! Should be ready tomorrow

…aks-to-create-expense-flow

JKobrynski · 2024-12-13T13:09:18Z

@trjExpensify I created a orderWorkspaceOptions method that puts the default workspace on top of the list and added it to orderOptions, it should be fine now.

trjExpensify · 2024-12-20T11:38:40Z

@suneox can you re-review today please? Thanks!

suneox · 2024-12-20T11:44:30Z

@suneox can you re-review today please? Thanks!

Yes, I'll continue the checklist within a few hours

trjExpensify · 2024-12-20T11:57:39Z

Great stuff, thanks! @JKobrynski looks like TypeScript Checks are failing?

…aks-to-create-expense-flow

suneox · 2024-12-20T12:59:52Z

src/libs/OptionsListUtils.ts

+    let workspaceChats: ReportUtils.OptionData[] = [];
+
+    if (shouldSeparateWorkspaceChat) {
+        workspaceChats = allReportOptions.filter((option) => option.isOwnPolicyExpenseChat);


Suggested change

workspaceChats = allReportOptions.filter((option) => option.isOwnPolicyExpenseChat);

workspaceChats = allReportOptions.filter((option) => option.isOwnPolicyExpenseChat && !option.private_isArchived);

We need to filter out archived workspaces.

Updated, thanks!

suneox · 2024-12-20T13:01:44Z

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 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: Native

Screen.Recording.2024-12-20.at.21.29.51.mp4

Android: mWeb Chrome

Screen.Recording.2024-12-20.at.21.17.15.mp4

iOS: Native

Screen.Recording.2024-12-20.at.21.10.17.mp4

iOS: mWeb Safari

Screen.Recording.2024-12-20.at.20.30.24.mp4

MacOS: Chrome / Safari

Screen.Recording.2024-12-20.at.20.26.40.mp4

MacOS: Desktop

Screen.Recording.2024-12-20.at.21.02.42.mp4

suneox · 2024-12-20T14:42:00Z

src/libs/OptionsListUtils.ts

+    if (typeof config?.maxRecentReportsToShow === 'number' && filteredWorkspaceChats && filteredWorkspaceChats?.length > config.maxRecentReportsToShow) {
+        filteredWorkspaceChats = filteredWorkspaceChats.slice(0, config.maxRecentReportsToShow);
+    }


@trjExpensify Should we set a limitation to show for the workspace list similar to recent reports, or show all available workspace options like in this demo?

Screen.Recording.2024-12-20.at.21.14.58.mp4

I would think we'd always show all workspaces there... for most people it would be uncommon to have a ton of workspaces like you are showing above.

Same, agreed!

Thanks for the confirmation. @JKobrynski we can remove this condition.

suneox

The changes LGTM. Just only need confirmation on the configuration for the number of workspace options to display.

grgia

This is testing well, nice work!

grgia · 2024-12-20T17:44:48Z

@JKobrynski could you fix conflicts 🙏

…aks-to-create-expense-flow

JKobrynski · 2024-12-20T20:34:14Z

Conflicts resolved!

mountiny

I would like to double check the correct default values based on the new guidelines. I am not sure if this is correct cc @suneox

mountiny · 2024-12-23T14:50:50Z

src/libs/OptionsListUtils.ts

@@ -492,7 +496,7 @@ function getIOUReportIDOfLastAction(report: OnyxEntry<Report>): string | undefin
 * Get the last message text from the report directly or from other sources for special cases.
 */
 function getLastMessageTextForReport(report: OnyxEntry<Report>, lastActorDetails: Partial<PersonalDetails> | null, policy?: OnyxEntry<Policy>): string {
-    const reportID = report?.reportID ?? '-1';
+    const reportID = report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID);


Looking at this we should never default to string value cc @VickyStash

Suggested change

const reportID = report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID);

const reportID = report?.reportID;

@mountiny Correct!
Also, this file is in the list of ignored files as it can be tricky to update it directly, so you should be able to skip id updates here and the lint will pass on its own.

@JKobrynski would you be able to update this please?

mountiny · 2024-12-23T14:51:17Z

src/libs/OptionsListUtils.ts

@@ -548,9 +552,16 @@ function getLastMessageTextForReport(report: OnyxEntry<Report>, lastActorDetails
        lastMessageTextFromReport = ReportUtils.getReimbursementDeQueuedActionMessage(lastReportAction, report, true);
    } else if (ReportActionUtils.isDeletedParentAction(lastReportAction) && ReportUtils.isChatReport(report)) {
        lastMessageTextFromReport = ReportUtils.getDeletedParentActionMessageForChatReport(lastReportAction);
-    } else if (ReportActionUtils.isPendingRemove(lastReportAction) && ReportActionUtils.isThreadParentMessage(lastReportAction, report?.reportID ?? '-1')) {
+    } else if (ReportActionUtils.isPendingRemove(lastReportAction) && ReportActionUtils.isThreadParentMessage(lastReportAction, report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID))) {


Same as above https://github.com/Expensify/App/blob/main/contributingGuides/STYLE.md#default-value-for-inexistent-ids

Suggested change

} else if (ReportActionUtils.isPendingRemove(lastReportAction) && ReportActionUtils.isThreadParentMessage(lastReportAction, report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID))) {

} else if (ReportActionUtils.isPendingRemove(lastReportAction) && ReportActionUtils.isThreadParentMessage(lastReportAction, report?.reportID)) {

mountiny · 2024-12-23T14:54:46Z

src/libs/OptionsListUtils.ts

-    } else if (ReportUtils.isReportMessageAttachment({text: report?.lastMessageText ?? '-1', html: report?.lastMessageHtml, translationKey: report?.lastMessageTranslationKey, type: ''})) {
+    } else if (
+        ReportUtils.isReportMessageAttachment({
+            text: report?.lastMessageText ?? String(CONST.DEFAULT_NUMBER_ID),


Same as above, I am not sure if I am misunderstanding the guidelines. It just feels like the empty string might be better here

Suggested change

text: report?.lastMessageText ?? String(CONST.DEFAULT_NUMBER_ID),

text: report?.lastMessageText ?? '',

I think eslint check even shouldn't complain on this place, as it's not ID.
@JKobrynski Correct me if I'm wrong.

mountiny · 2024-12-23T14:56:18Z

src/libs/OptionsListUtils.ts

    }: GetOptionsConfig = {},
 ): Options {
-    const topmostReportId = Navigation.getTopmostReportId() ?? '-1';
+    const topmostReportId = Navigation.getTopmostReportId() ?? String(CONST.DEFAULT_NUMBER_ID);


Here the same

Suggested change

const topmostReportId = Navigation.getTopmostReportId() ?? String(CONST.DEFAULT_NUMBER_ID);

const topmostReportId = Navigation.getTopmostReportId();

mountiny · 2024-12-23T14:56:59Z

src/libs/OptionsListUtils.ts

@@ -1234,7 +1278,7 @@ function getValidOptions(
            const shouldShowInvoiceRoom =
                includeInvoiceRooms &&
                ReportUtils.isInvoiceRoom(reportOption.item) &&
-                ReportUtils.isPolicyAdmin(reportOption.policyID ?? '', policies) &&
+                ReportUtils.isPolicyAdmin(reportOption.policyID ?? String(CONST.DEFAULT_NUMBER_ID), policies) &&


We should return early in the method if the value is undefined

Suggested change

ReportUtils.isPolicyAdmin(reportOption.policyID ?? String(CONST.DEFAULT_NUMBER_ID), policies) &&

ReportUtils.isPolicyAdmin(reportOption.policyID), policies) &&

mountiny · 2024-12-23T14:57:13Z

src/libs/OptionsListUtils.ts

        isSelected: member.isSelected ?? false,
        isDisabled: member.isDisabled ?? false,
        accountID,
        login: member.login ?? '',
        icons: member.icons,
        pendingAction: member.pendingAction,
-        reportID: member.reportID ?? '-1',
+        reportID: member.reportID ?? String(CONST.DEFAULT_NUMBER_ID),


Suggested change

reportID: member.reportID ?? String(CONST.DEFAULT_NUMBER_ID),

reportID: member.reportID,

mountiny · 2024-12-23T14:57:37Z

src/pages/iou/request/MoneyRequestParticipantsSelector.tsx

@@ -168,7 +158,7 @@ function MoneyRequestParticipantsSelector({

        const formatResults = OptionsListUtils.formatSectionsFromSearchTerm(
            debouncedSearchTerm,
-            participants.map((participant) => ({...participant, reportID: participant.reportID ?? '-1'})),
+            participants.map((participant) => ({...participant, reportID: participant.reportID ?? String(CONST.DEFAULT_NUMBER_ID)})),


Suggested change

participants.map((participant) => ({...participant, reportID: participant.reportID ?? String(CONST.DEFAULT_NUMBER_ID)})),

participants.map((participant) => ({...participant, reportID: participant.reportID})),

VickyStash · 2024-12-23T15:29:53Z

@JKobrynski is OOO till Dec 27th 🎄

…aks-to-create-expense-flow

JKobrynski · 2024-12-27T15:05:48Z

@mountiny I removed these string id fallbacks according to your comments, feel free to give it another look!

JKobrynski added 3 commits December 9, 2024 16:06

remove the Just track it button

49269d0

add the create $amount expense label

7a2556d

add Workspace and Personal sections to recipients list

103bf6c

JKobrynski marked this pull request as ready for review December 10, 2024 16:12

JKobrynski requested a review from a team as a code owner December 10, 2024 16:12

melvin-bot bot requested review from suneox and removed request for a team December 10, 2024 16:12

JKobrynski mentioned this pull request Dec 10, 2024

Tweaks to the Create Expense Flow #52981

Open

suneox reviewed Dec 10, 2024

View reviewed changes

src/languages/es.ts Outdated Show resolved Hide resolved

suneox reviewed Dec 10, 2024

View reviewed changes

src/libs/OptionsListUtils.ts Outdated Show resolved Hide resolved

Merge branch 'main' into JKobrynski/feat/tweaks-to-create-expense-flow

50bbaaa

trjExpensify assigned JKobrynski Dec 11, 2024

trjExpensify added the Ready To Build label Dec 11, 2024

trjExpensify mentioned this pull request Dec 11, 2024

Update contact picker in submit expense flow #53894

Open

JKobrynski added 2 commits December 11, 2024 14:36

Merge remote-tracking branch 'upstream/main' into JKobrynski/feat/twe…

3464608

…aks-to-create-expense-flow

update translation, add return type

052b1ff

Merge remote-tracking branch 'upstream/main' into JKobrynski/feat/twe…

520ec32

…aks-to-create-expense-flow

JKobrynski added 2 commits December 13, 2024 14:07

put default workspace on top of the list

676a76d

Merge remote-tracking branch 'upstream/main' into JKobrynski/feat/twe…

ff2fcc4

…aks-to-create-expense-flow

JKobrynski requested a review from trjExpensify December 13, 2024 13:09

JKobrynski requested a review from mountiny December 20, 2024 09:30

JKobrynski added 2 commits December 20, 2024 13:03

Merge remote-tracking branch 'upstream/main' into JKobrynski/feat/twe…

dd65178

…aks-to-create-expense-flow

remove ReportUtils.getReport references

d56d865

JKobrynski force-pushed the JKobrynski/feat/tweaks-to-create-expense-flow branch from 289a95c to d56d865 Compare December 20, 2024 12:53

suneox reviewed Dec 20, 2024

View reviewed changes

filter out archived workspaces

5f6ffce

suneox reviewed Dec 20, 2024

View reviewed changes

suneox approved these changes Dec 20, 2024

View reviewed changes

melvin-bot bot requested a review from grgia December 20, 2024 14:46

grgia previously approved these changes Dec 20, 2024

View reviewed changes

Merge remote-tracking branch 'upstream/main' into JKobrynski/feat/twe…

70ca10d

…aks-to-create-expense-flow

JKobrynski dismissed grgia’s stale review via 70ca10d December 20, 2024 20:28

JKobrynski requested a review from grgia December 20, 2024 20:28

remove limit of displayed workspaces

f246b59

JKobrynski requested a review from shawnborton December 20, 2024 20:34

mountiny requested changes Dec 23, 2024

View reviewed changes

JKobrynski added 3 commits December 27, 2024 10:36

Merge remote-tracking branch 'upstream/main' into JKobrynski/feat/twe…

a652bd5

…aks-to-create-expense-flow

fix id fallbacks

6a6207d

fix id fallback in MoneyRequestParticipantsSelector

9f49eed

JKobrynski requested review from mountiny, suneox and VickyStash December 27, 2024 15:05

	workspaceChats = allReportOptions.filter((option) => option.isOwnPolicyExpenseChat);
	workspaceChats = allReportOptions.filter((option) => option.isOwnPolicyExpenseChat && !option.private_isArchived);

	const reportID = report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID);
	const reportID = report?.reportID;

	} else if (ReportActionUtils.isPendingRemove(lastReportAction) && ReportActionUtils.isThreadParentMessage(lastReportAction, report?.reportID ?? String(CONST.DEFAULT_NUMBER_ID))) {
	} else if (ReportActionUtils.isPendingRemove(lastReportAction) && ReportActionUtils.isThreadParentMessage(lastReportAction, report?.reportID)) {

	text: report?.lastMessageText ?? String(CONST.DEFAULT_NUMBER_ID),
	text: report?.lastMessageText ?? '',

	const topmostReportId = Navigation.getTopmostReportId() ?? String(CONST.DEFAULT_NUMBER_ID);
	const topmostReportId = Navigation.getTopmostReportId();

	ReportUtils.isPolicyAdmin(reportOption.policyID ?? String(CONST.DEFAULT_NUMBER_ID), policies) &&
	ReportUtils.isPolicyAdmin(reportOption.policyID), policies) &&

	reportID: member.reportID ?? String(CONST.DEFAULT_NUMBER_ID),
	reportID: member.reportID,

	participants.map((participant) => ({...participant, reportID: participant.reportID ?? String(CONST.DEFAULT_NUMBER_ID)})),
	participants.map((participant) => ({...participant, reportID: participant.reportID})),

Tweaks to the expense flow #53760

Are you sure you want to change the base?

Tweaks to the expense flow #53760

Conversation

JKobrynski commented Dec 9, 2024 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Dec 10, 2024

github-actions bot commented Dec 11, 2024

github-actions bot commented Dec 11, 2024

shawnborton commented Dec 11, 2024

shawnborton commented Dec 11, 2024

trjExpensify commented Dec 12, 2024

trjExpensify commented Dec 12, 2024

trjExpensify commented Dec 12, 2024

JKobrynski commented Dec 12, 2024

JKobrynski commented Dec 13, 2024

trjExpensify commented Dec 20, 2024

suneox commented Dec 20, 2024

trjExpensify commented Dec 20, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

suneox commented Dec 20, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

suneox left a comment

Choose a reason for hiding this comment

grgia left a comment

Choose a reason for hiding this comment

grgia commented Dec 20, 2024

JKobrynski commented Dec 20, 2024

mountiny left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

VickyStash Dec 23, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

VickyStash commented Dec 23, 2024

JKobrynski commented Dec 27, 2024

JKobrynski commented Dec 9, 2024 •

edited

Loading

suneox commented Dec 20, 2024 •

edited

Loading

VickyStash Dec 23, 2024 •

edited

Loading