[TS migration] Migrate 'MoneyRequestConfirmationList.js' component to TypeScript #37716

kubabutkiewicz · 2024-03-05T08:37:19Z

Details

Fixed Issues

$ #25138

Tests

Login to app
Click on FAB icon
Select Send Money
Go through all steps for sending money
Verify all is working
Login to app
Click on FAB icon
Select Money Request
When selecting user click on Split button
Finish that process
Click on Split report to open confirmation list
Verify it look and work well
Login to app
To go Workspace chat
Click '+' icon
Select Split Bill
Select scan option
Go through this process
Verify that everything look and work well

Verify that no errors appear in the JS console

Offline tests

QA Steps

Login to app
Click on FAB icon
Select Send Money
Go through all steps for sending money
Verify all is working
Login to app
Click on FAB icon
Select Money Request
When selecting user click on Split button
Finish that process
Click on Split report to open confirmation list
Verify it look and work well
Login to app
To go Workspace chat
Click '+' icon
Select Split Bill
Select scan option
Go through this process
Verify that everything look and work well

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android.mp4

Android: mWeb Chrome

mchrome.mp4

iOS: Native

ios.mp4

iOS: mWeb Safari

msafari.mp4

MacOS: Chrome / Safari

web.mp4

MacOS: Desktop

desktop.mp4

…s-migration/MoneyRequestConfirmationList/component

src/components/MoneyRequestConfirmationList.tsx

VickyStash · 2024-03-07T13:20:21Z

src/components/MoneyRequestConfirmationList.tsx

@@ -589,8 +592,9 @@ function MoneyRequestConfirmationList(props) {
    ]);

    const {image: receiptImage, thumbnail: receiptThumbnail} =
-        props.receiptPath && props.receiptFilename ? ReceiptUtils.getThumbnailAndImageURIs(transaction, props.receiptPath, props.receiptFilename) : {};
+        receiptPath && receiptFilename ? ReceiptUtils.getThumbnailAndImageURIs(transaction, receiptPath, receiptFilename) : ({} as ReceiptUtils.ThumbnailAndImageURI);


You can simplify it if you want

const receipt = receiptPath && receiptFilename ? ReceiptUtils.getThumbnailAndImageURIs(transaction, receiptPath, receiptFilename) : null; const receiptImage = receipt?.image; const receiptThumbnail = receipt?.thumbnail;

src/components/MoneyRequestConfirmationList.tsx

src/languages/types.ts

src/libs/OptionsListUtils.ts

VickyStash · 2024-03-07T13:34:41Z

src/libs/ReceiptUtils.ts

@@ -33,7 +33,7 @@ type FileNameAndExtension = {
 * @param receiptPath
 * @param receiptFileName
 */
-function getThumbnailAndImageURIs(transaction: OnyxEntry<Transaction>, receiptPath: string | null = null, receiptFileName: string | null = null): ThumbnailAndImageURI {
+function getThumbnailAndImageURIs(transaction: OnyxEntry<Transaction> | undefined, receiptPath: string | null = null, receiptFileName: string | null = null): ThumbnailAndImageURI {


I think you can pass null instead of undefined to keep typing easier. To simplify you can add null as a default value in MoneyRequestConfirmationList. What do you think?

Suggested change

function getThumbnailAndImageURIs(transaction: OnyxEntry<Transaction> | undefined, receiptPath: string | null = null, receiptFileName: string | null = null): ThumbnailAndImageURI {

function getThumbnailAndImageURIs(transaction: OnyxEntry<Transaction>, receiptPath: string | null = null, receiptFileName: string | null = null): ThumbnailAndImageURI {

At the beginning I did that but then I realised I need to do it in a lot of places and decided that adding undefined to this type will be more readable

VickyStash · 2024-03-07T13:35:03Z

src/libs/TransactionUtils.ts

@@ -140,11 +140,11 @@ function hasReceipt(transaction: Transaction | undefined | null): boolean {
    return !!transaction?.receipt?.state || hasEReceipt(transaction);
 }

-function isMerchantMissing(transaction: Transaction) {
-    if (transaction.modifiedMerchant && transaction.modifiedMerchant !== '') {
+function isMerchantMissing(transaction: OnyxEntry<Transaction> | undefined) {


Same for every | undefined update in this file

I agree, could we avoid this?

VickyStash · 2024-03-07T13:43:18Z

src/components/MoneyRequestConfirmationList.tsx

+                onPress={(_event, value) => confirm(value as PaymentMethodType)}
                options={splitOrRequestOptions}


Since ButtonWithDropdownMenu has genric in typing, you can try to update splitOrRequestOptions typing to include PaymentMethodType instead of string. Though iouType and PaymentMethodType are not aligned, so there will be another TS problem.

I ended up typing confirm fn to by IouType | PaymentMethodType | undefined since I check and here from value we can only IouType based on implementation of splitOrRequestOptions but looking and implementation of sendMoney which is called inside confirm, sendMoney expects that the type will be PaymentMethodType which is odd since from my understanding it will never happen here

…s-migration/MoneyRequestConfirmationList/component

src/components/MoneyRequestConfirmationList.tsx

fabioh8010 · 2024-03-08T09:39:49Z

src/libs/TransactionUtils.ts

@@ -140,11 +140,11 @@ function hasReceipt(transaction: Transaction | undefined | null): boolean {
    return !!transaction?.receipt?.state || hasEReceipt(transaction);
 }

-function isMerchantMissing(transaction: Transaction) {
-    if (transaction.modifiedMerchant && transaction.modifiedMerchant !== '') {
+function isMerchantMissing(transaction: OnyxEntry<Transaction> | undefined) {


I agree, could we avoid this?

src/components/MoneyRequestConfirmationList.tsx

VickyStash · 2024-03-08T12:27:07Z

src/components/MoneyRequestConfirmationList.tsx

@@ -589,8 +590,9 @@ function MoneyRequestConfirmationList(props) {
    ]);

    const {image: receiptImage, thumbnail: receiptThumbnail} =
-        props.receiptPath && props.receiptFilename ? ReceiptUtils.getThumbnailAndImageURIs(transaction, props.receiptPath, props.receiptFilename) : {};
+        receiptPath && receiptFilename ? ReceiptUtils.getThumbnailAndImageURIs(transaction ?? null, receiptPath, receiptFilename) : ({} as ReceiptUtils.ThumbnailAndImageURI);


You decided to skip this comment or is it just lost?

I decided to skip it I think its fine to leave it as it was

src/components/MoneyRequestConfirmationList.tsx

melvin-bot · 2024-03-08T14:51:32Z

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

hoangzinh · 2024-03-10T14:23:47Z

src/components/MoneyRequestConfirmationList.tsx

                    ...participant,
-                    isDisabled: ReportUtils.isOptimisticPersonalDetail(participant.accountID),
+                    isDisabled: ReportUtils.isOptimisticPersonalDetail(participant.accountID ?? -1),


Should we modify ReportUtils.isOptimisticPersonalDetail to allow either number or undefined, then early exit if it's undefined there? Use a default value here doesn't look good to me.

Currently when passing -1 or undefined its returning true so to not changing logic I would leave it as it is

hoangzinh · 2024-03-10T14:24:12Z

src/components/MoneyRequestConfirmationList.tsx

                ...participant,
-                isDisabled: ReportUtils.isOptimisticPersonalDetail(participant.accountID),
+                isDisabled: ReportUtils.isOptimisticPersonalDetail(participant.accountID ?? -1),


Same as above

hoangzinh · 2024-03-10T14:38:31Z

src/components/MoneyRequestConfirmationList.tsx

-                                        return;
-                                    }
-                                    Navigation.navigate(ROUTES.MONEY_REQUEST_TAG.getRoute(props.iouType, props.reportID));
+                                    Navigation.navigate(


Are we missing moving condition isEditingSplitBill from old component?

Adjusted 😄

hoangzinh · 2024-03-10T14:54:23Z

Hi @fedirjh, This PR comes from here #25138 (comment). Let @kubabutkiewicz and me continue to work on it. Thanks

…s-migration/MoneyRequestConfirmationList/component

hoangzinh · 2024-03-12T00:29:24Z

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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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

Screen.Recording.2024-03-12.at.19.16.22.android.mov

Android: mWeb Chrome

Screen.Recording.2024-03-12.at.18.41.45.android.chrome.mov

iOS: Native

Screen.Recording.2024-03-12.at.19.19.39.ios.mov

iOS: mWeb Safari

Screen.Recording.2024-03-12.at.19.21.49.ios.safari.mov

MacOS: Chrome / Safari

Screen.Recording.2024-03-12.at.07.23.43.web.mp4

MacOS: Desktop

Screen.Recording.2024-03-12.at.18.36.03.desktop.mov

hoangzinh

LGTM. Tested on:

Send money
Split bill with a WS
Split bill with an individual user

OSBotify · 2024-03-12T15:32:31Z

✋ 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-03-12T18:50:15Z

🚀 Deployed to staging by https://github.com/AndrewGable in version: 1.4.51-0 🚀

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

OSBotify · 2024-03-13T19:45:30Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.4.51-3 🚀

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

kubabutkiewicz added 14 commits March 5, 2024 09:36

fix: move MoneyRequestConfirmationList to TS

382a644

ref: wip

99148ba

ref: wip

fbbd5da

fix: wip

fdde7d7

Merge branch 'main' of github.com:kubabutkiewicz/expensify-app into t…

72db8f1

…s-migration/MoneyRequestConfirmationList/component

fix: typecheck

cbfda06

fix: remove log

99e5725

fix: gemfile.lock

69e24c0

fix: revert changes from Gemfile.lock

afd7e1f

fix: remove unwanted file

d5e9c61

fix: remove unwanted changes

a5af01a

fix: some adjustments

ec3016e

fix: added small adjustments

a3c2f91

Merge branch 'main' of github.com:kubabutkiewicz/expensify-app into t…

20dc6a0

…s-migration/MoneyRequestConfirmationList/component

VickyStash reviewed Mar 7, 2024

View reviewed changes

kubabutkiewicz added 3 commits March 8, 2024 08:22

Merge branch 'main' of github.com:kubabutkiewicz/expensify-app into t…

1bc3731

…s-migration/MoneyRequestConfirmationList/component

fix: resolving comments

09eb438

fix: remove logs

be674d7

fabioh8010 reviewed Mar 8, 2024

View reviewed changes

fix: resolve comments

a811128

VickyStash reviewed Mar 8, 2024

View reviewed changes

fix: resolve comments

7b83517

VickyStash approved these changes Mar 8, 2024

View reviewed changes

fabioh8010 approved these changes Mar 8, 2024

View reviewed changes

kubabutkiewicz marked this pull request as ready for review March 8, 2024 14:51

kubabutkiewicz requested a review from a team as a code owner March 8, 2024 14:51

melvin-bot bot requested review from fedirjh and removed request for a team March 8, 2024 14:51

hoangzinh reviewed Mar 10, 2024

View reviewed changes

kubabutkiewicz added 2 commits March 11, 2024 11:43

Merge branch 'main' of github.com:kubabutkiewicz/expensify-app into t…

a97db10

…s-migration/MoneyRequestConfirmationList/component

fix: lint

67e4721

hoangzinh approved these changes Mar 12, 2024

View reviewed changes

melvin-bot bot requested a review from AndrewGable March 12, 2024 12:26

This was referenced Mar 12, 2024

[PAID] [Splits] [$500] Split scan - Split button is not disabled after clicking split for group chat split request #38130

Closed

[TS migration] Migrate MoneyTemporaryForRefactorRequestConfirmationList.js component to TypeScript #37181

Merged

AndrewGable removed the request for review from fedirjh March 12, 2024 15:26

AndrewGable approved these changes Mar 12, 2024

View reviewed changes

AndrewGable merged commit eb6213f into Expensify:main Mar 12, 2024
16 checks passed

github-actions bot mentioned this pull request Mar 12, 2024

Deploy Checklist: New Expensify 2024-03-12 #38162

Closed

84 tasks

melvin-bot bot mentioned this pull request Mar 13, 2024

[HOLD for payment 2024-03-20] [TS migration] Migrate 'MoneyRequestConfirmationList.js' component to TypeScript #25138

Closed

brunovjk mentioned this pull request Apr 4, 2024

[HOLD for payment 2024-05-02] [$250] Remove MoneyRequestConfirmationList.js and copy any changes since Nov 27 into MoneyTemporaryForRefactorRequestConfirmationList.js #39559

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[TS migration] Migrate 'MoneyRequestConfirmationList.js' component to TypeScript #37716

[TS migration] Migrate 'MoneyRequestConfirmationList.js' component to TypeScript #37716

kubabutkiewicz commented Mar 5, 2024 •

edited

Loading

VickyStash Mar 7, 2024

VickyStash Mar 7, 2024

kubabutkiewicz Mar 8, 2024

VickyStash Mar 7, 2024

fabioh8010 Mar 8, 2024

VickyStash Mar 7, 2024

kubabutkiewicz Mar 8, 2024

fabioh8010 Mar 8, 2024

VickyStash Mar 8, 2024

kubabutkiewicz Mar 8, 2024

melvin-bot bot commented Mar 8, 2024

hoangzinh Mar 10, 2024

kubabutkiewicz Mar 11, 2024 •

edited

Loading

hoangzinh Mar 10, 2024

hoangzinh Mar 10, 2024

kubabutkiewicz Mar 11, 2024

hoangzinh commented Mar 10, 2024 •

edited

Loading

hoangzinh commented Mar 12, 2024 •

edited

Loading

hoangzinh left a comment

OSBotify commented Mar 12, 2024

OSBotify commented Mar 12, 2024

OSBotify commented Mar 13, 2024

	function getThumbnailAndImageURIs(transaction: OnyxEntry<Transaction> \| undefined, receiptPath: string \| null = null, receiptFileName: string \| null = null): ThumbnailAndImageURI {
	function getThumbnailAndImageURIs(transaction: OnyxEntry<Transaction>, receiptPath: string \| null = null, receiptFileName: string \| null = null): ThumbnailAndImageURI {

		onPress={(_event, value) => confirm(value as PaymentMethodType)}
		options={splitOrRequestOptions}

[TS migration] Migrate 'MoneyRequestConfirmationList.js' component to TypeScript #37716

[TS migration] Migrate 'MoneyRequestConfirmationList.js' component to TypeScript #37716

Conversation

kubabutkiewicz commented Mar 5, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author 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

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

melvin-bot bot commented Mar 8, 2024

Choose a reason for hiding this comment

kubabutkiewicz Mar 11, 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

hoangzinh commented Mar 10, 2024 • edited Loading

hoangzinh commented Mar 12, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

hoangzinh left a comment

Choose a reason for hiding this comment

OSBotify commented Mar 12, 2024

OSBotify commented Mar 12, 2024

OSBotify commented Mar 13, 2024

kubabutkiewicz commented Mar 5, 2024 •

edited

Loading

kubabutkiewicz Mar 11, 2024 •

edited

Loading

hoangzinh commented Mar 10, 2024 •

edited

Loading

hoangzinh commented Mar 12, 2024 •

edited

Loading