[Fix]: Requestee cannot hold requests in 1:1 IOU transactions #40319

allgandalf · 2024-04-17T00:04:15Z

Details

There was a bug in 1:1 IOU that the requestee was not allowed to hold the request, in this PR we allow the requestee to hold the request as well

Fixed Issues

$ #37554
PROPOSAL: #37554 (comment)

Tests

Same as QA

Verify that no errors appear in the JS console

Offline tests

Same as QA

QA Steps

Login from one account
Request money 1:1 with the same user 2 times
Login from that other account to which you have requested money
Open chat and navigate to any one of the money request by the previously logged in user.
Try holding the request

The request should be held successfully

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

MacOS: Desktop

Screen.Recording.2024-04-17.at.5.51.44.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-04-17.at.5.45.47.AM.mov

Android: Native

Screen.Recording.2024-04-18.at.12.35.47.AM.mov

Android: mWeb Chrome

Screen.Recording.2024-04-18.at.12.40.11.AM.mov

iOS: Native

Screen.Recording.2024-04-17.at.6.37.41.AM.mov

iOS: mWeb Safari

WhatsApp.Video.2024-04-17.at.6.55.02.AM.mp4

melvin-bot · 2024-04-17T00:04:20Z

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

allgandalf · 2024-04-17T00:08:18Z

@sobitneupane , isGroupPolicy is used so that it will return false for 1:1 IOU and we still would be able to hold request for the Requestee, this checks if the request is a part of a policy. Thanks

App/src/libs/ReportUtils.ts

Lines 877 to 880 in 7efdde8

    
           function isGroupPolicy(report: OnyxEntry<Report>): boolean { 
        
               const policyType = getPolicyType(report, allPolicies); 
        
               return policyType === CONST.POLICY.TYPE.CORPORATE || policyType === CONST.POLICY.TYPE.TEAM || policyType === CONST.POLICY.TYPE.FREE; 
        
           }

And for 1:1 requests, the policy type is PERSONAL

App/src/CONST.ts

Lines 1515 to 1518 in 1a20e16

    
           POLICY: { 
        
               TYPE: { 
        
                   FREE: 'free', 
        
                   PERSONAL: 'personal',

allgandalf · 2024-04-17T01:26:39Z

@sobitneupane , facing some issue with android built, have uploaded all other platform videos, will upload android soon, you can review in the meantime the PR is ready ;)

allgandalf · 2024-04-17T19:11:27Z

Thanks for the patience @sobitneupane, Added the android videos too ;)

sobitneupane

Screenshots/Videos

Android: Native

Screen.Recording.2024-04-18.at.16.52.50.mov

Android: mWeb Chrome

iOS: Native

Screen.Recording.2024-04-18.at.17.01.58.mov

iOS: mWeb Safari

Screen.Recording.2024-04-18.at.16.55.58.mov

MacOS: Chrome / Safari

Untitled.mov

MacOS: Desktop

Screen.Recording.2024-04-18.at.17.06.29.mov

sobitneupane

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.

dangrous

Some minor comment edits for clarity, looking good!

src/pages/iou/HoldReasonPage.tsx

allgandalf · 2024-04-19T09:06:39Z

@dangrous , Updated the comments ;) thanks

allgandalf · 2024-04-19T09:08:30Z

@dangrous @sobitneupane , we have a merge conflict here which removes the fallback, not sure what to do here :) Have to be careful don't want to break functionality :

dangrous · 2024-04-19T15:14:27Z

@dangrous @sobitneupane , we have a merge conflict here which removes the fallback, not sure what to do here :) Have to be careful don't want to break functionality :

Hm, can you see where that change came from? We might be able to figure out how to move forward by learning why they made the change...

allgandalf · 2024-04-19T20:50:39Z

Change is coming from here, they have defined strict policy types and not fallback values, but I did find a solution to this, updating the code accordingly

They returned early if the type is not present, but we fix that case with this PR by making it fallback to personal.

allgandalf · 2024-04-19T21:06:32Z

Also policy type is undefined for requestee because:

We are passing policy type here instead of the iouType and for a non-active policy it will be undefined empty after the TS migration PR. Due to that, it will form the incorrect route without iouType and lead to the not found page.
If we see the getRoute of the ROUTES.MONEY_REQUEST_HOLD_REASON it expects the first parameter should be the iouType not the policyType.

sobitneupane · 2024-04-22T07:01:25Z

Thanks for the update @GandalfGwaihir. After this change, one of the parties(the one being requested) won't be able to hold request in 1:1 IOU. So, I believe we should still proceed with this PR.

allgandalf · 2024-04-22T07:03:27Z

Yes right, the current up to date PR is complete!

allgandalf · 2024-04-23T20:46:56Z

Friendly bump to @dangrous to merge this one :)

dangrous

LGTM!

OSBotify · 2024-04-26T17:27:25Z

✋ 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-26T23:21:08Z

🚀 Deployed to staging by https://github.com/dangrous in version: 1.4.67-0 🚀

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

OSBotify · 2024-04-29T23:12:55Z

🚀 Deployed to production by https://github.com/francoisl in version: 1.4.67-7 🚀

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

OSBotify · 2024-04-30T00:40:24Z

🚀 Deployed to production by https://github.com/francoisl in version: 1.4.67-7 🚀

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

Allow the requestee in 1:1 transactions to hold requests

efbbda3

allgandalf requested a review from a team as a code owner April 17, 2024 00:04

melvin-bot bot requested review from sobitneupane and removed request for a team April 17, 2024 00:04

Remove console log

9711d32

add isWorkspaceRequest as dependency

56c484e

sobitneupane reviewed Apr 18, 2024

View reviewed changes

sobitneupane approved these changes Apr 18, 2024

View reviewed changes

melvin-bot bot requested a review from dangrous April 18, 2024 11:29

dangrous requested changes Apr 18, 2024

View reviewed changes

src/pages/iou/HoldReasonPage.tsx Outdated Show resolved Hide resolved

src/pages/iou/HoldReasonPage.tsx Outdated Show resolved Hide resolved

src/pages/iou/HoldReasonPage.tsx Outdated Show resolved Hide resolved

src/pages/iou/HoldReasonPage.tsx Outdated Show resolved Hide resolved

Update comments based on suggestions

272b35d

fix merge conflict

13af897

allgandalf requested a review from dangrous April 19, 2024 20:56

fix merge conflict

9802487

allgandalf mentioned this pull request Apr 26, 2024

[$250] IOU - Unable to hold request as requestee #40935

Closed

6 tasks

dangrous approved these changes Apr 26, 2024

View reviewed changes

dangrous merged commit 035adb8 into Expensify:main Apr 26, 2024
15 checks passed

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

Deploy Checklist: New Expensify 2024-04-26 #41122

Closed

63 tasks

melvin-bot bot mentioned this pull request Apr 29, 2024

[HOLD for payment 2024-05-06] [$250] [Held requests] Hold request link for the requestee shows "undefined" #37554

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Fix]: Requestee cannot hold requests in 1:1 IOU transactions #40319

[Fix]: Requestee cannot hold requests in 1:1 IOU transactions #40319

allgandalf commented Apr 17, 2024 •

edited

Loading

melvin-bot bot commented Apr 17, 2024

allgandalf commented Apr 17, 2024 •

edited

Loading

allgandalf commented Apr 17, 2024

allgandalf commented Apr 17, 2024

sobitneupane left a comment

sobitneupane left a comment

dangrous left a comment

allgandalf commented Apr 19, 2024

allgandalf commented Apr 19, 2024

dangrous commented Apr 19, 2024

allgandalf commented Apr 19, 2024 •

edited

Loading

allgandalf commented Apr 19, 2024

sobitneupane commented Apr 22, 2024 •

edited

Loading

allgandalf commented Apr 22, 2024 •

edited

Loading

allgandalf commented Apr 23, 2024

dangrous left a comment

OSBotify commented Apr 26, 2024

OSBotify commented Apr 26, 2024

OSBotify commented Apr 29, 2024

OSBotify commented Apr 30, 2024

[Fix]: Requestee cannot hold requests in 1:1 IOU transactions #40319

[Fix]: Requestee cannot hold requests in 1:1 IOU transactions #40319

Conversation

allgandalf commented Apr 17, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Apr 17, 2024

allgandalf commented Apr 17, 2024 • edited Loading

allgandalf commented Apr 17, 2024

allgandalf commented Apr 17, 2024

sobitneupane left a comment

Choose a reason for hiding this comment

Screenshots/Videos

sobitneupane left a comment

Choose a reason for hiding this comment

Reviewer Checklist

dangrous left a comment

Choose a reason for hiding this comment

allgandalf commented Apr 19, 2024

allgandalf commented Apr 19, 2024

dangrous commented Apr 19, 2024

allgandalf commented Apr 19, 2024 • edited Loading

allgandalf commented Apr 19, 2024

sobitneupane commented Apr 22, 2024 • edited Loading

allgandalf commented Apr 22, 2024 • edited Loading

allgandalf commented Apr 23, 2024

dangrous left a comment

Choose a reason for hiding this comment

OSBotify commented Apr 26, 2024

OSBotify commented Apr 26, 2024

OSBotify commented Apr 29, 2024

OSBotify commented Apr 30, 2024

allgandalf commented Apr 17, 2024 •

edited

Loading

allgandalf commented Apr 17, 2024 •

edited

Loading

allgandalf commented Apr 19, 2024 •

edited

Loading

sobitneupane commented Apr 22, 2024 •

edited

Loading

allgandalf commented Apr 22, 2024 •

edited

Loading