Renaming money request to expense #39483

shubham1206agra · 2024-04-03T10:28:27Z

Details

Fixed Issues

$ #40070

Tests

Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests

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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

shubham1206agra · 2024-04-11T17:03:07Z

src/libs/ReportUtils.ts

@@ -3357,7 +3354,7 @@ function getIOUReportActionMessage(iouReportID: string, type: string, total: num
            iouMessage = `submitted ${amount}`;
            break;
        case CONST.IOU.REPORT_ACTION_TYPE.CREATE:
-            iouMessage = `requested ${amount}${comment && ` for ${comment}`}`;
+            iouMessage = `requested ${amount}${comment && ` for ${comment}`}`; // TODO: Recheck this


@mountiny Need to sync BE to pass correct message.

yeah I am updating that

src/languages/en.ts

src/CONST.ts

src/components/ReportActionItem/MoneyRequestPreview/types.ts

src/languages/en.ts

Co-authored-by: G T <75031127+getusha@users.noreply.github.com>

src/components/ReportActionItem/MoneyRequestPreview/types.ts

melvin-bot · 2024-04-12T15:34:35Z

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

shubham1206agra · 2024-04-12T15:35:09Z

@pecanoro Can you start spanish translation here?

…name-flow

src/languages/es.ts

Co-authored-by: Rocio Perez-Cano <pecanoro@users.noreply.github.com>

src/languages/es.ts

Co-authored-by: Rocio Perez-Cano <pecanoro@users.noreply.github.com>

getusha · 2024-04-16T18:33:33Z

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

mountiny

@shubham1206agra @getusha its shaping up great!

.well-known/apple-app-site-association

src/libs/actions/User.ts

src/libs/ReportUtils.ts

Co-authored-by: Vit Horacek <36083550+mountiny@users.noreply.github.com>

mountiny

@pecanoro Are you happy with the translations?

pecanoro · 2024-04-17T10:48:22Z

src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx

@@ -364,14 +364,14 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
        if (isTypeTrackExpense) {
            text = translate('iou.trackExpense');
        } else if (isTypeSplit && iouAmount === 0) {
-            text = translate('iou.split');
+            text = translate('iou.splitExpense');


This is changing the old copy, is this on purpose?

src/components/MoneyTemporaryForRefactorRequestConfirmationList.tsx

src/languages/es.ts

src/libs/OptionsListUtils.ts

src/pages/iou/request/step/IOURequestStepMerchant.tsx

tests/unit/IOUUtilsTest.ts

Co-authored-by: Rocio Perez-Cano <pecanoro@users.noreply.github.com>

pecanoro

Last small typos

src/libs/ReportUtils.ts

Co-authored-by: Rocio Perez-Cano <pecanoro@users.noreply.github.com>

mountiny

Thank you @pecanoro for help ❤️

OSBotify · 2024-04-17T16:53:53Z

✋ 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-18T04:56:05Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.4.63-0 🚀

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

OSBotify · 2024-04-22T14:57:04Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.4.63-21 🚀

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

shubham1206agra added 10 commits April 3, 2024 15:57

Renaming money request to expense

1f3726e

Merge main

99f9534

Fix translation after merge

30eaee6

More translation fix

d2ee607

More translation fix

aa7017c

More translation fix

375cd74

Fixing the mistakes

027421d

Merge main

e669383

Fixing translations

4be2d73

Fixed wrong translation

ee08c76

shubham1206agra commented Apr 11, 2024

View reviewed changes

shubham1206agra added 2 commits April 11, 2024 22:37

Fixed message

ff152a3

Fixed jest tests

ddc621e

getusha suggested changes Apr 12, 2024

View reviewed changes

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

src/languages/en.ts Show resolved Hide resolved

src/languages/en.ts Show resolved Hide resolved

getusha suggested changes Apr 12, 2024

View reviewed changes

shubham1206agra and others added 4 commits April 12, 2024 18:04

Apply suggestions from code review

08a2a48

Co-authored-by: G T <75031127+getusha@users.noreply.github.com>

Fixed translations

a0c1b0f

Fixed paySomeone

86e92d2

Merge branch 'main' into rename-flow

30ae1bd

shubham1206agra commented Apr 12, 2024

View reviewed changes

src/components/ReportActionItem/MoneyRequestPreview/types.ts Outdated Show resolved Hide resolved

shubham1206agra and others added 3 commits April 12, 2024 18:51

Apply suggestions from code review

4db9c26

Removed extra TODO

b015888

Merge main

b8f2b68

shubham1206agra marked this pull request as ready for review April 12, 2024 15:34

shubham1206agra requested a review from a team as a code owner April 12, 2024 15:34

melvin-bot bot removed the request for review from a team April 12, 2024 15:34

melvin-bot bot requested a review from getusha April 12, 2024 15:34

Merge branch 'main' of https://github.com/shubham1206agra/App into re…

d86ab29

…name-flow

shubham1206agra commented Apr 16, 2024

View reviewed changes

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

shubham1206agra commented Apr 16, 2024

View reviewed changes

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

shubham1206agra and others added 2 commits April 16, 2024 16:45

Apply suggestions from code review

f2d893e

Co-authored-by: Rocio Perez-Cano <pecanoro@users.noreply.github.com>

Fixed bad merge

8107aa2

pecanoro requested changes Apr 16, 2024

View reviewed changes

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

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

Apply suggestions from code review

0a875c9

Co-authored-by: Rocio Perez-Cano <pecanoro@users.noreply.github.com>

getusha approved these changes Apr 16, 2024

View reviewed changes

melvin-bot bot requested a review from mountiny April 16, 2024 18:33

mountiny requested changes Apr 16, 2024

View reviewed changes

shubham1206agra and others added 4 commits April 17, 2024 07:12

Apply suggestions from code review

ef13ceb

Co-authored-by: Vit Horacek <36083550+mountiny@users.noreply.github.com>

Merge main

a1438f5

Fixed translations

7268729

Addressed comments

63da26a

shubham1206agra requested a review from mountiny April 17, 2024 03:47

mountiny previously approved these changes Apr 17, 2024

View reviewed changes

pecanoro requested changes Apr 17, 2024

View reviewed changes

Apply suggestions from code review

c7cd851

Co-authored-by: Rocio Perez-Cano <pecanoro@users.noreply.github.com>

shubham1206agra dismissed mountiny’s stale review via c7cd851 April 17, 2024 11:38

pecanoro requested changes Apr 17, 2024

View reviewed changes

Apply suggestions from code review

5ce1479

Co-authored-by: Rocio Perez-Cano <pecanoro@users.noreply.github.com>

pecanoro approved these changes Apr 17, 2024

View reviewed changes

mountiny approved these changes Apr 17, 2024

View reviewed changes

mountiny merged commit b35d357 into Expensify:main Apr 17, 2024
16 checks passed

mountiny changed the title ~~[NoQA] Renaming money request to expense~~ Renaming money request to expense Apr 17, 2024

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

Deploy Checklist: New Expensify 2024-04-18 #40392

Closed

mountiny mentioned this pull request Apr 29, 2024

[$250] [HOLD for payment 2024-05-05] Payment issue for Add Split expense to Global Create #41255

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Renaming money request to expense #39483

Renaming money request to expense #39483

shubham1206agra commented Apr 3, 2024 •

edited

Loading

shubham1206agra Apr 11, 2024

mountiny Apr 15, 2024

melvin-bot bot commented Apr 12, 2024

shubham1206agra commented Apr 12, 2024

getusha commented Apr 16, 2024

mountiny left a comment

mountiny left a comment

pecanoro Apr 17, 2024

pecanoro left a comment

mountiny left a comment

OSBotify commented Apr 17, 2024

OSBotify commented Apr 18, 2024

OSBotify commented Apr 22, 2024

Renaming money request to expense #39483

Renaming money request to expense #39483

Conversation

shubham1206agra commented Apr 3, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

shubham1206agra Apr 11, 2024

Choose a reason for hiding this comment

mountiny Apr 15, 2024

Choose a reason for hiding this comment

melvin-bot bot commented Apr 12, 2024

shubham1206agra commented Apr 12, 2024

getusha commented Apr 16, 2024

Reviewer Checklist

Screenshots/Videos

mountiny left a comment

Choose a reason for hiding this comment

mountiny left a comment

Choose a reason for hiding this comment

pecanoro Apr 17, 2024

Choose a reason for hiding this comment

pecanoro left a comment

Choose a reason for hiding this comment

mountiny left a comment

Choose a reason for hiding this comment

OSBotify commented Apr 17, 2024

OSBotify commented Apr 18, 2024

OSBotify commented Apr 22, 2024

shubham1206agra commented Apr 3, 2024 •

edited

Loading