Fix popover position for payment buttons #28744

Nikhil-Vats · 2023-10-03T20:09:00Z

Details

Fixed Issues

Tests

You can test this using 2 of your accounts or you can also create a new workspace with only 1 member (logged in user) and request money. As you are the only member, request money button will be visible.

Use 2 of your accounts for testing. Login with account 1, request money in the chat by going to chat with account 2 > click on + button > Request money > Enter details and click on request money button. Afterwards login with account 2 and follow the steps below -
In the chat, click the pay button in Report Preview. The popover should open above the button.

See screenshot to see what it should look like.
Now, click on the report preview and in the header try clicking on the caret (dropdown icon) and the main button and make sure both popovers open below the button.

See video to see what it should look like.

Screen.Recording.2023-10-04.at.1.30.43.AM.mov
Now, go to settings > wallet. Click on transfer balance and verify that the popover opens below the transfer balance button.

See video to see what it should look like.

Screen.Recording.2023-10-04.at.1.32.07.AM.mov

Verify that no errors appear in the JS console

Offline tests

Same as above.

QA Steps

Same as above.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

26070_web.mp4

Mobile Web - Chrome

26070_mweb_chrome.mp4

Mobile Web - Safari

26070_mweb_safari.mp4

Desktop

26070_desktop.mp4

iOS

26070_ios.mp4

Android

26070_android.mp4

melvin-bot · 2023-10-03T20:09:05Z

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

Nikhil-Vats · 2023-10-03T20:10:45Z

src/components/ButtonWithDropdownMenu.js

@@ -143,6 +143,7 @@ function ButtonWithDropdownMenu(props) {
            ) : (
                <Button
                    success
+                    ref={props.buttonRef}


@aimane-chnaif I added this to fix this bug because I also found it during testing.

Nikhil-Vats · 2023-10-03T20:13:22Z

src/components/KYCWall/BaseKYCWall.js

        if (this.state.shouldShowAddPaymentMenu) {
            this.setState({shouldShowAddPaymentMenu: false});
            return;
        }
-        this.setState({transferBalanceButton: event.nativeEvent.target});
+        this.setState({transferBalanceButton: this.anchorRef.current});


This was required for BaseWalletPage, as transfer balance button contains multiple clickable items so if we used event.nativeEvent.target the popover position used to differ slightly based on where we clicked. See video to see the bug -

Screen.Recording.2023-10-04.at.1.42.55.AM.mov

Nikhil-Vats · 2023-10-03T20:13:58Z

src/components/MoneyReportHeader.js

@@ -107,6 +107,10 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
                            shouldShowPaymentOptions
                            style={[styles.pv2]}
                            formattedAmount={formattedAmount}
+                            anchorAlignment={{


In header button, popover should open below button (anchor should be at top)

Nikhil-Vats · 2023-10-03T20:15:10Z

src/components/ReportActionItem/ReportPreview.js

@@ -230,6 +230,10 @@ function ReportPreview(props) {
                                enablePaymentsRoute={ROUTES.ENABLE_PAYMENTS}
                                addBankAccountRoute={bankAccountRoute}
                                style={[styles.requestPreviewBox]}
+                                anchorAlignment={{
+                                    horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT,
+                                    vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,


In ReportPreview, popover should open above button so anchor is bottom.

Nikhil-Vats · 2023-10-03T20:15:38Z

src/pages/settings/Wallet/WalletPage/BaseWalletPage.js

-                                    popoverPlacement="bottom"
+                                    anchorAlignment={{
+                                        horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT,
+                                        vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,


popover should open below button, so vertical anchor position is top.

Nikhil-Vats · 2023-10-03T20:17:31Z

src/components/KYCWall/BaseKYCWall.js

@@ -62,9 +62,9 @@ class KYCWall extends React.Component {
     * @returns {Object}
     */
    getAnchorPosition(domRect) {
-        if (this.props.popoverPlacement === 'bottom') {
+        if (this.props.anchorAlignment.vertical === CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP) {


explanation here -

App/src/components/ButtonWithDropdownMenu.js

Lines 91 to 94 in f77a5a5

props.anchorAlignment.vertical === CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP

? y + h + CONST.MODAL.POPOVER_MENU_PADDING // if vertical anchorAlignment is TOP, menu will open below the button and we need to add the height of button and padding

: y - CONST.MODAL.POPOVER_MENU_PADDING, // if it is BOTTOM, menu will open above the button so NO need to add height but DO subtract padding

});

Nikhil-Vats · 2023-10-03T22:07:28Z

@aimane-chnaif PR is ready for review.

Nikhil-Vats · 2023-10-04T17:29:06Z

src/components/KYCWall/BaseKYCWall.js

@@ -110,7 +110,7 @@ class KYCWall extends React.Component {
            (!isExpenseReport && !PaymentUtils.hasExpensifyPaymentMethod(paymentCardList, this.props.bankAccountList))
        ) {
            Log.info('[KYC Wallet] User does not have valid payment method');
-            const clickedElementLocation = getClickedTargetLocation(event.nativeEvent.target);
+            const clickedElementLocation = getClickedTargetLocation(this.anchorRef.current);


@aimane-chnaif if you want we can keep it as this.anchorRef.current || event.nativeEvent.target to be on the safer side. Same for usage above.

Let's do that for safety

Can we apply the change for safety here and also above?

@aimane-chnaif @marcochavezf done.

Nikhil-Vats · 2023-10-05T08:33:46Z

@aimane-chnaif let me know if you have any suggestions.

aimane-chnaif

Thanks for the detailed explanations per each line change

aimane-chnaif · 2023-10-05T10:19:36Z

src/components/KYCWall/BaseKYCWall.js

@@ -110,7 +110,7 @@ class KYCWall extends React.Component {
            (!isExpenseReport && !PaymentUtils.hasExpensifyPaymentMethod(paymentCardList, this.props.bankAccountList))
        ) {
            Log.info('[KYC Wallet] User does not have valid payment method');
-            const clickedElementLocation = getClickedTargetLocation(event.nativeEvent.target);
+            const clickedElementLocation = getClickedTargetLocation(this.anchorRef.current);


Let's do that for safety

aimane-chnaif · 2023-10-05T10:25:10Z

Step 3 doesn't work for me

Screen.Recording.2023-10-05.at.11.23.56.AM.mov

Nikhil-Vats · 2023-10-05T11:12:34Z

@aimane-chnaif do you mean that the fix doesn't work for you?

aimane-chnaif · 2023-10-05T11:14:44Z

@aimane-chnaif do you mean that the fix doesn't work for you?

yes, as you see my video. I tested this branch after pulling main locally

aimane-chnaif · 2023-10-05T12:49:18Z

@Nikhil-Vats you reproduced and working on fix, right?

Nikhil-Vats · 2023-10-05T13:46:38Z

@aimane-chnaif can you please try again once? I just tested and it works for me. It was working for me before as well as I attached the test videos on all platforms and there was no merge with main either.

fix.mp4

aimane-chnaif · 2023-10-05T13:47:35Z

@Nikhil-Vats did you test after merging latest main?

Nikhil-Vats · 2023-10-05T13:48:13Z

@aimane-chnaif I did not merge latest main as there is no conflict. Should I do it?

aimane-chnaif · 2023-10-05T13:48:26Z

I did not merge latest main as there is no conflict. Should I do it?

yes you should

Nikhil-Vats · 2023-10-05T13:53:32Z

@aimane-chnaif It works after merging too, can you please recheck once?

Screen.Recording.2023-10-05.at.7.23.04.PM.mov

Nikhil-Vats · 2023-10-05T13:55:05Z

I did not some weird with other bugs (before merge too) -

Debit card sometimes redirect to a chat.
ReportPreview shows Pay elsewhere even when I change it to Pay with expensify in expense report.

Let me know if you face them too and I will create bug reports for them.

aimane-chnaif · 2023-10-05T15:22:18Z

still pull main and push to this branch

aimane-chnaif · 2023-10-05T15:26:13Z

Make sure that you don't have any new commits not pushed. Bug is still not fixed on this branch

Nikhil-Vats · 2023-10-05T15:34:53Z

@aimane-chnaif I have just pushed after merging with latest main. Can you test again?

aimane-chnaif · 2023-10-05T15:44:10Z

Works fine now. Not sure what was wrong

aimane-chnaif · 2023-10-05T15:52:26Z

Let's leave this popover position at bottom
Edit: I see this is existing behavior on main. It's ideal to apply dynamic position based on scroll position but I think this can be out of scope.

Screen.Recording.2023-10-05.at.4.51.34.PM.mov

aimane-chnaif · 2023-10-05T16:26:14Z

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 / Chrome
- iOS / native
- iOS / 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 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 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(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 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 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

Web

web.mov

Mobile Web - Chrome

mchrome.mov

Mobile Web - Safari

msafari.mov

Desktop

desktop.mov

iOS

ios.mov

Android

aimane-chnaif

LGTM 🎉

marcochavezf · 2023-10-05T16:59:57Z

src/components/KYCWall/BaseKYCWall.js

@@ -110,7 +110,7 @@ class KYCWall extends React.Component {
            (!isExpenseReport && !PaymentUtils.hasExpensifyPaymentMethod(paymentCardList, this.props.bankAccountList))
        ) {
            Log.info('[KYC Wallet] User does not have valid payment method');
-            const clickedElementLocation = getClickedTargetLocation(event.nativeEvent.target);
+            const clickedElementLocation = getClickedTargetLocation(this.anchorRef.current);


Can we apply the change for safety here and also above?

Nikhil-Vats · 2023-10-05T17:14:39Z

@marcochavezf I have applied the suggested changes.

marcochavezf · 2023-10-05T17:26:51Z

src/components/KYCWall/BaseKYCWall.js

@@ -100,7 +100,8 @@ class KYCWall extends React.Component {
            this.setState({shouldShowAddPaymentMenu: false});
            return;
        }
-        this.setState({transferBalanceButton: event.nativeEvent.target});
+        const targetElement = this.anchorRef.current || event.nativeEvent.target; // safety check - use target from event if anchorRef is null


Let's add the comment above the code

Suggested change

const targetElement = this.anchorRef.current || event.nativeEvent.target; // safety check - use target from event if anchorRef is null

// Use event target as fallback if anchorRef is null for safety

const targetElement = this.anchorRef.current || event.nativeEvent.target;

Nikhil-Vats · 2023-10-05T17:31:09Z

Done @marcochavezf

src/components/KYCWall/BaseKYCWall.js

Nikhil-Vats · 2023-10-05T18:03:39Z

Fixed @marcochavezf

Nikhil-Vats · 2023-10-05T18:06:40Z

Don't know why it hasn't marked the suggestion as outdated but I added an empty line, check here

marcochavezf · 2023-10-05T19:00:40Z

LGTM, thanks guys!

OSBotify · 2023-10-05T19:08:12Z

✋ 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 · 2023-10-06T08:23:48Z

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

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

kavimuru · 2023-10-06T16:48:06Z

@marcochavezf @aimane-chnaif Step 4 is failing. We have silver wallet accounts only. I remember it requires gold wallet for "transfer balance" to appear. Could you confirm?

aimane-chnaif · 2023-10-06T16:51:40Z

@marcochavezf @aimane-chnaif Step 4 is failing. We have silver wallet accounts only. I remember it requires gold wallet for "transfer balance" to appear. Could you confirm?

Correct. Transfer balance should not be visible to all accounts. Step 4 is testable only when you login with those accounts.
Btw Transfer balance visibility is not related to this PR.

kavimuru · 2023-10-06T16:59:12Z

@aimane-chnaif , this will be validated internally?

Click on transfer balance and verify that the popover opens below the transfer balance button.

aimane-chnaif · 2023-10-06T17:03:32Z

@aimane-chnaif , this will be validated internally?

Click on transfer balance and verify that the popover opens below the transfer balance button.

I think you can skip that case if you're not able to test easily.
@Nikhil-Vats and I demonstrated working as expected.
or @marcochavezf you will validate again internally?

web.mov

OSBotify · 2023-10-09T22:32:22Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.79-5 🚀

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

OSBotify · 2023-10-09T22:41:15Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.79-5 🚀

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

OSBotify · 2023-10-09T23:17:09Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.79-5 🚀

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

Fix popover position for payment buttons

ccd1b31

Nikhil-Vats requested a review from a team as a code owner October 3, 2023 20:09

melvin-bot bot requested review from aimane-chnaif and removed request for a team October 3, 2023 20:09

Nikhil-Vats commented Oct 3, 2023

View reviewed changes

Nikhil-Vats commented Oct 4, 2023

View reviewed changes

aimane-chnaif reviewed Oct 5, 2023

View reviewed changes

Merge branch 'main' into 26070_fix_popover_position

e5652b6

aimane-chnaif approved these changes Oct 5, 2023

View reviewed changes

melvin-bot bot requested a review from marcochavezf October 5, 2023 16:27

marcochavezf requested changes Oct 5, 2023

View reviewed changes

Add safety check for target element

46c3045

marcochavezf requested changes Oct 5, 2023

View reviewed changes

Improve comment

5b7f439

marcochavezf requested changes Oct 5, 2023

View reviewed changes

src/components/KYCWall/BaseKYCWall.js Show resolved Hide resolved

Add empty line before comment

3ba03d1

marcochavezf approved these changes Oct 5, 2023

View reviewed changes

marcochavezf merged commit 8d42ad3 into Expensify:main Oct 5, 2023
11 checks passed

OSBotify mentioned this pull request Oct 6, 2023

Deploy Checklist: New Expensify 2023-10-06 #28983

Closed

lanitochka17 mentioned this pull request Oct 6, 2023

[$500] Wallet - "Transfer balance" button not available #29016

Closed

6 tasks

melvin-bot bot mentioned this pull request Oct 9, 2023

[HOLD for payment 2023-10-16] [$500] Add payment method popover has wrong position #26070

Closed

6 tasks

Pujan92 mentioned this pull request Oct 11, 2023

[HOLD for payment 2023-10-31][$500] App displays 'Pay with expensify' popup on side and not over the button #29332

Closed

6 tasks

	props.anchorAlignment.vertical === CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP
	? y + h + CONST.MODAL.POPOVER_MENU_PADDING // if vertical anchorAlignment is TOP, menu will open below the button and we need to add the height of button and padding
	: y - CONST.MODAL.POPOVER_MENU_PADDING, // if it is BOTTOM, menu will open above the button so NO need to add height but DO subtract padding
	});

	const targetElement = this.anchorRef.current \|\| event.nativeEvent.target; // safety check - use target from event if anchorRef is null
	// Use event target as fallback if anchorRef is null for safety
	const targetElement = this.anchorRef.current \|\| event.nativeEvent.target;

Fix popover position for payment buttons #28744

Fix popover position for payment buttons #28744

Conversation

Nikhil-Vats commented Oct 3, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Oct 3, 2023

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

Nikhil-Vats commented Oct 3, 2023

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

Nikhil-Vats commented Oct 5, 2023

aimane-chnaif left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aimane-chnaif commented Oct 5, 2023

Nikhil-Vats commented Oct 5, 2023

aimane-chnaif commented Oct 5, 2023

aimane-chnaif commented Oct 5, 2023

Nikhil-Vats commented Oct 5, 2023

aimane-chnaif commented Oct 5, 2023

Nikhil-Vats commented Oct 5, 2023 • edited Loading

aimane-chnaif commented Oct 5, 2023

Nikhil-Vats commented Oct 5, 2023

Nikhil-Vats commented Oct 5, 2023 • edited Loading

aimane-chnaif commented Oct 5, 2023

aimane-chnaif commented Oct 5, 2023 • edited Loading

Nikhil-Vats commented Oct 5, 2023

aimane-chnaif commented Oct 5, 2023

aimane-chnaif commented Oct 5, 2023 • edited Loading

aimane-chnaif commented Oct 5, 2023

Reviewer Checklist

Screenshots/Videos

aimane-chnaif left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Nikhil-Vats commented Oct 5, 2023

Choose a reason for hiding this comment

Nikhil-Vats commented Oct 5, 2023

Nikhil-Vats commented Oct 5, 2023

Nikhil-Vats commented Oct 5, 2023

marcochavezf commented Oct 5, 2023

OSBotify commented Oct 5, 2023

OSBotify commented Oct 6, 2023

kavimuru commented Oct 6, 2023

aimane-chnaif commented Oct 6, 2023

kavimuru commented Oct 6, 2023

aimane-chnaif commented Oct 6, 2023

OSBotify commented Oct 9, 2023

OSBotify commented Oct 9, 2023

OSBotify commented Oct 9, 2023

Nikhil-Vats commented Oct 3, 2023 •

edited

Loading

Nikhil-Vats commented Oct 5, 2023 •

edited

Loading

Nikhil-Vats commented Oct 5, 2023 •

edited

Loading

aimane-chnaif commented Oct 5, 2023 •

edited

Loading

aimane-chnaif commented Oct 5, 2023 •

edited

Loading