Track expense by Nodebrute · Pull Request #40988 · Expensify/App

Nodebrute · 2024-04-25T15:04:01Z

Details

Fixed Issues

Tests

Step 1: Navigate to FAB and choose 'Track Expense'.
Step 2: Create a new scan request.
Step 3: Open the scan request to monitor its status.
Step 4: Confirm that the header indicates 'Scan in progress...' while scanning.
Step 5: Verify that 'Scanning...' is displayed in the 'Amount * Cash' and 'Merchant' fields while scanning

Verify that no errors appear in the JS console

Offline tests

Step 1: Navigate to FAB and choose 'Track Expense'.
Step 2: Create a new scan request.
Step 3: Open the scan request to monitor its status.
Step 4: Confirm that the header indicates 'Scan in progress...' while scanning.
Step 5: Verify that 'Scanning...' is displayed in the 'Amount * Cash' and 'Merchant' fields while scanning

QA Steps

Step 1: Navigate to FAB and choose 'Track Expense'.
Step 2: Create a new scan request.
Step 3: Open the scan request to monitor its status.
Step 4: Confirm that the header indicates 'Scan in progress...' while scanning.
Step 5: Verify that 'Scanning...' is displayed in the 'Amount * Cash' and 'Merchant' fields while scanning

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-04-25T15:04:06Z

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

fedirjh · 2024-04-25T23:27:35Z

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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

fedirjh

Looks good. left small code suggestion.

src/components/ReportActionItem/MoneyRequestView.tsx

fedirjh · 2024-04-26T03:13:37Z

src/libs/ReportUtils.ts

    if (ReportActionsUtils.isTrackExpenseAction(reportAction)) {
-        if (isEmptyObject(transaction)) {
-            return Localize.translateLocal('iou.trackExpense');
-        }
        const transactionDetails = getTransactionDetails(transaction);
        return Localize.translateLocal('iou.threadTrackReportName', {
            formattedAmount: CurrencyUtils.convertToDisplayString(transactionDetails?.amount ?? 0, transactionDetails?.currency) ?? '',
            comment: (!TransactionUtils.isMerchantMissing(transaction) ? transactionDetails?.merchant : transactionDetails?.comment) ?? '',
        });
    }


I think this block should be moved to the bottom.

src/libs/ReportUtils.ts

Nodebrute · 2024-04-26T19:25:11Z

@fedirjh I've made the suggested changes to the PR. It's ready for your review. I haven't added screenshots for Android because I'm having issues with the Android build. I'll add them as soon as I can.

fedirjh · 2024-04-26T21:16:46Z

src/libs/ReportUtils.ts

+    if (ReportActionsUtils.isTrackExpenseAction(reportAction)) {
+        return Localize.translateLocal('iou.threadTrackReportName', {
+            formattedAmount: CurrencyUtils.convertToDisplayString(transactionDetails?.amount ?? 0, transactionDetails?.currency) ?? '',
+            comment: (!TransactionUtils.isMerchantMissing(transaction) ? transactionDetails?.merchant : transactionDetails?.comment) ?? '',
+        });
+    }


Suggested change

if (ReportActionsUtils.isTrackExpenseAction(reportAction)) {

return Localize.translateLocal('iou.threadTrackReportName', {

formattedAmount: CurrencyUtils.convertToDisplayString(transactionDetails?.amount ?? 0, transactionDetails?.currency) ?? '',

comment: (!TransactionUtils.isMerchantMissing(transaction) ? transactionDetails?.merchant : transactionDetails?.comment) ?? '',

});

}

Dupe code. We have this check in line 2647

I'm sorry for the errors in my PR. I've been dealing with some personal stress, which might have caused me to overlook things. I'll be more thorough in the future, and I appreciate your patience as I work through this.

@Nodebrute Take care of yourself, and don't worry too much about it. We all have those moments, We're all here to support each other.

fedirjh

marcochavezf

LGTM, thank you guys!

OSBotify · 2024-04-29T20:09:36Z

✋ 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 · 2024-04-29T23:35:27Z

🚀 Cherry-picked to staging by https://github.com/francoisl in version: 1.4.67-7 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2024-04-30T01:15:24Z

🚀 Deployed to staging by https://github.com/marcochavezf in version: 1.4.68-0 🚀

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

OSBotify · 2024-04-30T02:36:12Z

🚀 Cherry-picked to staging by https://github.com/francoisl in version: 1.4.67-7 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2024-05-01T02:39:34Z

🚀 Deployed to production by https://github.com/francoisl in version: 1.4.68-3 🚀

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

Nodebrute added 2 commits April 25, 2024 19:27

add Scan in progress

3c7b7fd

run prettier

5c8de39

Nodebrute requested a review from a team as a code owner April 25, 2024 15:04

melvin-bot bot requested review from fedirjh and removed request for a team April 25, 2024 15:04

Fix lint error

4d4e255

fedirjh reviewed Apr 26, 2024

View reviewed changes

Nodebrute and others added 3 commits April 27, 2024 00:11

Refactored the code

9b4da0d

Merge branch 'Expensify:main' into trackExpense

6e8ad5a

link fix

7141703

fedirjh suggested changes Apr 26, 2024

View reviewed changes

remove dupe code

814853e

fedirjh approved these changes Apr 26, 2024

View reviewed changes

melvin-bot bot requested a review from marcochavezf April 26, 2024 22:40

marcochavezf approved these changes Apr 29, 2024

View reviewed changes

marcochavezf merged commit c2d53be into Expensify:main Apr 29, 2024

github-actions bot mentioned this pull request Apr 29, 2024

Deploy Checklist: New Expensify 2024-04-29 #41266

Closed

74 tasks

lanitochka17 mentioned this pull request Apr 30, 2024

[HOLD for payment 2024-06-20] [$250] Track expense - Tracking report does not appear in LHN when the tracking is created offlne #41284

Closed

6 tasks

melvin-bot bot mentioned this pull request May 1, 2024

[HOLD for payment 2024-05-08] CRITICAL: [Track expense] [$250] Make SmartScanning expense-level thread less confusing #40366

Closed

Nodebrute deleted the trackExpense branch May 5, 2024 12:40

Conversation

Nodebrute commented Apr 25, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Apr 25, 2024

Uh oh!

fedirjh commented Apr 25, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

fedirjh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

fedirjh Apr 26, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Nodebrute commented Apr 26, 2024

Uh oh!

fedirjh Apr 26, 2024

Choose a reason for hiding this comment

Uh oh!

Nodebrute Apr 26, 2024

Choose a reason for hiding this comment

Uh oh!

fedirjh Apr 26, 2024

Choose a reason for hiding this comment

Uh oh!

fedirjh left a comment

Choose a reason for hiding this comment

Uh oh!

marcochavezf left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Apr 29, 2024

Uh oh!

OSBotify commented Apr 29, 2024

Uh oh!

OSBotify commented Apr 30, 2024

Uh oh!

OSBotify commented Apr 30, 2024

Uh oh!

OSBotify commented May 1, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Nodebrute commented Apr 25, 2024 •

edited

Loading

fedirjh commented Apr 25, 2024 •

edited

Loading