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

[A/B Testing - Create Expense] Implement Create Expense Flow under hidden Beta #49007

Merged
merged 28 commits into from
Oct 1, 2024

Conversation

fabioh8010
Copy link
Contributor

@fabioh8010 fabioh8010 commented Sep 11, 2024

Details

This PR implements the Combined Expense Flow under the corresponding beta.

Fixed Issues

$ #48787
PROPOSAL: #47598 (comment)

Tests

  • Verify that no errors appear in the JS console
  1. Assert you have the combinedTrackSubmit beta enabled in your account.
  2. Click the FAB to open the Global Create menu, assert there is a Create expense option and there are no Track expense and Submit expense options.
  3. Click the Create expense option to open the page, assert the page's title is Create expense.
  4. Click the Manual tab, insert an amount and click Next to navigate to the next page. Assert the page's title is Submit expense and there is a Just track it button.
  5. Click the Just track it button to navigate to the Track expense confirmation page. Assert the page's title is Track expense. Confirm and assert the expense was tracked.
  6. Repeat steps 4 and 5 for Scan and Distance requests.
  7. Repeat steps 4, 5 and 6 for Manual, Scan and Distance requests, but now submit the expense to someone else instead of tracking it. Assert the confirmation page's title is Submit expense.

Offline tests

Same as above.

QA Steps

  • Verify that no errors appear in the JS console

Same as above.

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 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 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.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 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.
  • 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
Screen.Recording.2024-09-17.at.16.43.49-compressed.mov
Android: mWeb Chrome
Screen.Recording.2024-09-17.at.16.50.18-compressed.mov
iOS: Native
Screen.Recording.2024-09-17.at.17.01.34-compressed.mov
iOS: mWeb Safari
Screen.Recording.2024-09-17.at.17.04.28-compressed.mov
MacOS: Chrome / Safari
Screen.Recording.2024-09-17.at.17.09.59-compressed.mov
Screen.Recording.2024-09-17.at.17.13.57-compressed.mov
MacOS: Desktop
Screen.Recording.2024-09-17.at.17.20.20-compressed.mov

@fabioh8010 fabioh8010 changed the title [A/B Testing - Create Expense] Implement Create Expense Flow under hidden Beta [WIP] [A/B Testing - Create Expense] Implement Create Expense Flow under hidden Beta Sep 11, 2024
@fabioh8010 fabioh8010 marked this pull request as ready for review September 17, 2024 16:39
@fabioh8010 fabioh8010 requested a review from a team as a code owner September 17, 2024 16:39
@melvin-bot melvin-bot bot requested review from fedirjh and removed request for a team September 17, 2024 16:39
Copy link

melvin-bot bot commented Sep 17, 2024

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

@fabioh8010 fabioh8010 changed the title [WIP] [A/B Testing - Create Expense] Implement Create Expense Flow under hidden Beta [A/B Testing - Create Expense] Implement Create Expense Flow under hidden Beta Sep 17, 2024
@grgia grgia self-requested a review September 19, 2024 16:12
@fabioh8010
Copy link
Contributor Author

@grgia I had to migrate the following components to useOnyx:

  • AccessOrNotFoundWrapper
  • AttachmentPickerWithMenuItems
  • FloatingActionButtonAndPopover
  • IOURequestStepAmount
  • IOURequestStepDistance
  • IOURequestStepScan
  • IOURequestStepParticipants
  • ReportWelcomeText

I'll do some quick testing around them on Monday.

@grgia
Copy link
Contributor

grgia commented Sep 20, 2024

@fabioh8010 would it be better to move the useOnyx updates to a separate PR?

@grgia
Copy link
Contributor

grgia commented Sep 20, 2024

@fabioh8010, can you also ensure that we replace track/submit for this case in all scenarios throughout the app?

For example in the report create menu:
Screenshot 2024-09-20 at 11 13 43 AM

@fabioh8010
Copy link
Contributor Author

@fabioh8010 would it be better to move the useOnyx updates to a separate PR?

Yes I would actually prefer that if you are fine with this.

@fabioh8010, can you also ensure that we replace track/submit for this case in all scenarios throughout the app?

@grgia From what I understood we should only do this in the Global Create menu, could you confirm that we need to do in all the other scenarios?

@grgia
Copy link
Contributor

grgia commented Sep 20, 2024

@fabioh8010

From what I understood we should only do this in the #47598, could you confirm that we need to do in all the other scenarios?

Yes, we decided in an internal slack convo [link for internal reference] to replace this option in all the menus yesterday

@grgia
Copy link
Contributor

grgia commented Sep 20, 2024

Yes I would actually prefer that if you are fine with this.
If you want to move them into a new PR, ping me in slack or add me as a reviewer and I'll find someone to help test it!

@fabioh8010
Copy link
Contributor Author

@fabioh8010 On iOS native, the create expense screens flashes

CleanShot.2024-09-26.at.12.56.28.mp4

Hi @fedirjh I'm having same behavior on main.

Screen.Recording.2024-09-30.at.17.54.44.mov

@grgia
Copy link
Contributor

grgia commented Sep 30, 2024

Going to trigger a new adhoc build

Copy link
Contributor

Copy link
Contributor

@grgia grgia left a comment

Choose a reason for hiding this comment

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

Tests well in ADHOC so far, a few minor comments.

@fedirjh could you take a look at this? I think we could merge it today.

src/CONST.ts Outdated Show resolved Hide resolved
src/pages/workspace/AccessOrNotFoundWrapper.tsx Outdated Show resolved Hide resolved
Copy link
Contributor

@grgia grgia left a comment

Choose a reason for hiding this comment

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

Code changes LGTM, I'll trigger a final build now

@fedirjh
Copy link
Contributor

fedirjh commented Oct 1, 2024

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 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
  • 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(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.
  • 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
CleanShot.2024-10-01.at.11.34.11.mp4
Android: mWeb Chrome
CleanShot.2024-10-01.at.11.50.50-converted.mp4
iOS: Native
Screen.Recording.2024-10-01.at.11.41.19.AM-converted.mov
iOS: mWeb Safari
Screen.Recording.2024-10-01.at.12.01.12.PM.mov
MacOS: Chrome / Safari
CleanShot.2024-10-01.at.11.16.13-converted.mp4
MacOS: Desktop
CleanShot.2024-10-01.at.11.09.46-converted.mp4
Screenshot 2024-10-01 at 11 08 56 AM Screenshot 2024-10-01 at 11 09 08 AM

Copy link
Contributor

@fedirjh fedirjh left a comment

Choose a reason for hiding this comment

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

Looks good to me as well.

@melvin-bot melvin-bot bot requested a review from grgia October 1, 2024 11:10
Copy link
Contributor

github-actions bot commented Oct 1, 2024

Copy link
Contributor

@grgia grgia left a comment

Choose a reason for hiding this comment

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

LGTM!

@grgia grgia merged commit 1ff3994 into Expensify:main Oct 1, 2024
16 of 18 checks passed
@melvin-bot melvin-bot bot added the Emergency label Oct 1, 2024
Copy link

melvin-bot bot commented Oct 1, 2024

@grgia looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@grgia grgia removed the Emergency label Oct 1, 2024
@grgia
Copy link
Contributor

grgia commented Oct 1, 2024

Lint errors are being handled here: #49592

@OSBotify
Copy link
Contributor

OSBotify commented Oct 1, 2024

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

Copy link
Contributor

github-actions bot commented Oct 2, 2024

🚀 Deployed to staging by https://github.com/grgia in version: 9.0.43-0 🚀

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

1 similar comment
Copy link
Contributor

github-actions bot commented Oct 2, 2024

🚀 Deployed to staging by https://github.com/grgia in version: 9.0.43-0 🚀

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

@lanitochka17
Copy link

lanitochka17 commented Oct 2, 2024

This PR is failing because of issue #50058
Step 2 fails

The issue is reproducible in: all

Bug6622023_1727866383691.20241002_185114.1.mp4

Copy link
Contributor

github-actions bot commented Oct 3, 2024

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.0.43-6 🚀

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

Comment on lines +157 to +167
const trackExpense = () => {
// If coming from the combined submit/track flow and the user proceeds to just track the expense,
// we will use the track IOU type in the confirmation flow.
if (!selfDMReportID) {
return;
}

IOU.setMoneyRequestParticipantsFromReport(transactionID, ReportUtils.getReport(selfDMReportID));
const iouConfirmationPageRoute = ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(action, CONST.IOU.TYPE.TRACK, transactionID, selfDMReportID);
Navigation.navigate(iouConfirmationPageRoute);
};
Copy link
Contributor

@s77rt s77rt Nov 10, 2024

Choose a reason for hiding this comment

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

In addition to setting the participants we had to set the the custom unit rate id. Without the rate the distance shows as pending

const isDistanceRequestWithPendingRoute = isDistanceRequest && (!hasRoute || !rate) && !isMovingTransactionFromTrackExpense;

(Coming from #51679)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants