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

Add pay button to money request header #18692

Merged
merged 69 commits into from
May 18, 2023
Merged

Add pay button to money request header #18692

merged 69 commits into from
May 18, 2023

Conversation

iwiznia
Copy link
Contributor

@iwiznia iwiznia commented May 9, 2023

Details

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/270704
PROPOSAL: GH_LINK_ISSUE(COMMENT)

Tests

  • Create a workspace and invite a user
  • With the invited user, request money in the workspace chat
  • Go to the report that was created for this request, check the header does not show the pay button:
image - With the owner of the workspace, open the request report and check the pay button is there: image - Check you can see the 2 options to pay it: image - Click `Pay with expensify`, check you get redirected to add a bank account

Offline tests

QA Steps

  • Verify that no errors appear in the JS console

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 / Chrome
    • iOS / native
    • iOS / 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • 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 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(themeColors.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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

N/A Merging to get it deployed for EC3. I did a lot of testing while developing.

Web
Mobile Web - Chrome
Mobile Web - Safari
Desktop
iOS
Android

@iwiznia iwiznia self-assigned this May 9, 2023
src/libs/actions/IOU.js Outdated Show resolved Hide resolved
@iwiznia iwiznia requested review from luacmartins and mountiny May 11, 2023 23:32
src/components/MoneyRequestHeader.js Outdated Show resolved Hide resolved
src/components/MoneyRequestHeader.js Outdated Show resolved Hide resolved
src/components/MoneyRequestHeader.js Outdated Show resolved Hide resolved
src/libs/actions/IOU.js Outdated Show resolved Hide resolved
src/libs/actions/IOU.js Outdated Show resolved Hide resolved
src/libs/actions/IOU.js Outdated Show resolved Hide resolved
@iwiznia iwiznia changed the title Start working on money request header [HOLD web] Start working on money request header May 12, 2023
@iwiznia iwiznia changed the title [HOLD web] Start working on money request header [HOLD web] Add pay button to money request header May 12, 2023
OSBotify added a commit that referenced this pull request May 18, 2023
@mvtglobally
Copy link

mvtglobally commented May 18, 2023

@iwiznia @yuwenmemon Is this expected? as per steps the header should now show "Go to the report that was created for this request, check the header does NOT show the pay button:"

Recording.2755.mp4

@luacmartins
Copy link
Contributor

@mvtglobally that is expected since the user in the video is the owner/admin of that workspace (they created the workspace). The invited user is the one who shouldn't see the pay button.

@mvtglobally
Copy link

Is this expected?
Screen Shot 2023-05-17 at 9 51 26 PM

@luacmartins
Copy link
Contributor

answered in Slack

@OSBotify
Copy link
Contributor

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 1.3.15-12 🚀

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

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

@aimane-chnaif
Copy link
Contributor

This PR caused several invalid prop type errors. Need to be fixed as a follow-up

Screen.Recording.2023-05-18.at.5.41.50.AM.mov

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/yuwenmemon in version: 1.3.15-12 🚀

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

@Julesssss
Copy link
Contributor

This PR caused several invalid prop type errors. Need to be fixed as a follow-up

Hey @aimane-chnaif, did you report this as a bug? I'll assign you this follow up PR if you'd like.

@aimane-chnaif
Copy link
Contributor

Hey @aimane-chnaif, did you report this as a bug? I'll assign you this follow up PR if you'd like.

@Julesssss Not reported yet. yes, I'd like to fix

@Julesssss
Copy link
Contributor

Julesssss commented May 18, 2023

Cool, just post it in the #expensify-bugs Slack channel and link me. I'll create the issue

Update: issue

Comment on lines -1193 to -1199
function payMoneyRequestWithWallet(chatReport, iouReport, recipient) {
const {params, optimisticData, successData, failureData} = getPayMoneyRequestParams(chatReport, iouReport, recipient, CONST.IOU.PAYMENT_TYPE.EXPENSIFY);

API.write('PayMoneyRequestWithWallet', params, {optimisticData, successData, failureData});

Navigation.navigate(ROUTES.getReportRoute(chatReport.reportID));
}
Copy link
Contributor

Choose a reason for hiding this comment

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

This should not have been removed

Copy link
Contributor

Choose a reason for hiding this comment

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

More context please? This function among others were simplified into one payMoneyRequest.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm re-adding it as a part of https://github.com/Expensify/Expensify/issues/285824, will have a PR up on there today

const selectItem = (index) => {
const selectedItem = props.menuItems[index];
props.onItemSelected(selectedItem);
selectedItem.onSelected();
Copy link
Member

@rushatgabhane rushatgabhane May 30, 2023

Choose a reason for hiding this comment

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

Beep boop 🤖 🐧

Dropping a friendly note here that we caused a regression - iOS - Some Popover buttons not) working

We're calling selectedItem.onSelected() here, which is called when the MenuItem is pressed.

For the case of 'Upload photo', 'Add attachment' etc menu items, when the button is pressed it will open another modal.

When the current PopoverMenu modal doesn't hide completely yet, 2 modals opening at the same time will cause screen freezing in iOS, and the second modal will not show.

The fix was to call this function when the menu closes.

@OSBotify
Copy link
Contributor

🚀 Cherry-picked to staging by https://github.com/AndrewGable in version: 1.3.28-2 🚀

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

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.3.28-5 🚀

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

Comment on lines +65 to +66
anchorPosition={props.anchorPosition}
anchorAlignment={props.anchorOrigin}
Copy link
Collaborator

Choose a reason for hiding this comment

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

This PR caused a regression #19453
We are passing the wrong prop here anchorAlignment={props.anchorOrigin} should be anchorAlignment={props.anchorAlignment} More detail #19453 (comment)

Comment on lines +57 to +68
useEffect(() => {
if (!caretButton.current) {
return;
}
caretButton.current.measureInWindow((x, y, w, h) => {
setPopoverAnchorPosition({
horizontal: x + w,
vertical: y + h,
});
});
}, [windowWidth, windowHeight]);

Copy link
Contributor

Choose a reason for hiding this comment

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

This caused a regression #20262. The popover position is calculated too early at the first render where animation is not done yet (position is not stable yet).

Comment on lines +72 to 74
anchorPositionVertical: domRect.top - 150,
anchorPositionHorizontal: domRect.left,
};
Copy link
Collaborator

Choose a reason for hiding this comment

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

This change caused a regression here. anchorPositionVertical value was not set correctly here after moving from anchorPositionTop, we updated it correctly here

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

Successfully merging this pull request may close these issues.