Skip to content

Fix edit menu popup hiding pay option #24064

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.

Sign up for GitHub

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

Merged
johnmlee101 merged 9 commits into from
Aug 10, 2023
+71 −70
Merged

Fix edit menu popup hiding pay option #24064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
451c730
Fix edit menu popup hiding pay option
huzaifa-99 Aug 2, 2023
8788e83
Use effect instead of callback for recalculating popover position
huzaifa-99 Aug 2, 2023
30f8cd3
Merge branch 'Expensify:main' into 23884-fix-edit-menu-popup-hiding-p…
huzaifa-99 Aug 3, 2023
4bf4f50
Merge branch 'Expensify:main' into 23884-fix-edit-menu-popup-hiding-p…
huzaifa-99 Aug 5, 2023
2ccf6bb
Set correct popover anchor on payment method press
huzaifa-99 Aug 5, 2023
be726be
Update popover position when payment list header changes
huzaifa-99 Aug 5, 2023
1863888
Merge branch 'Expensify:main' into 23884-fix-edit-menu-popup-hiding-p…
huzaifa-99 Aug 7, 2023
435bff9
Merge branch 'Expensify:main' into 23884-fix-edit-menu-popup-hiding-p…
huzaifa-99 Aug 8, 2023
81ca455
Update payment list anchor on flat list content change
huzaifa-99 Aug 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/pages/settings/Payments/PaymentMethodList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ const propTypes = {
/** Content for the FlatList header component */
listHeaderComponent: PropTypes.func,

/** Callback for whenever FlatList component size changes */
onListContentSizeChange: PropTypes.func,

/** React ref being forwarded to the PaymentMethodList Button */
buttonRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),

Expand All @@ -93,6 +96,7 @@ const defaultProps = {
selectedMethodID: '',
listHeaderComponent: null,
buttonRef: () => {},
onListContentSizeChange: () => {},
};

/**
Expand Down Expand Up @@ -246,6 +250,7 @@ function PaymentMethodList(props) {
keyExtractor={(item) => item.key}
ListEmptyComponent={renderListEmptyComponent(translate)}
ListHeaderComponent={props.listHeaderComponent}
onContentSizeChange={props.onListContentSizeChange}
/>
{props.shouldShowAddPaymentMethodButton && (
<FormAlertWrapper>
Expand Down
136 changes: 66 additions & 70 deletions src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ function BasePaymentsPage(props) {
});
const addPaymentMethodAnchorRef = useRef(null);
const deletePaymentMethodAnchorRef = useRef(null);
const paymentMethodButtonRef = useRef(null);
const [anchorPosition, setAnchorPosition] = useState({
anchorPositionHorizontal: 0,
anchorPositionVertical: 0,
anchorPositionTop: 0,
anchorPositionRight: 0,
});
const [addPaymentMethodButton, setAddPaymentMethodButton] = useState(null);
const [showConfirmDeleteContent, setShowConfirmDeleteContent] = useState(false);

const updateShouldShowLoadingSpinner = useCallback(() => {
Expand All @@ -74,27 +74,20 @@ function BasePaymentsPage(props) {
*
* @param {Object} position
*/
const setPositionAddPaymentMenu = useCallback(
(position) => {
setAnchorPosition({
anchorPositionTop: position.top + position.height + variables.addPaymentPopoverTopSpacing,

// We want the position to be 13px to the right of the left border
anchorPositionRight: windowWidth - position.right + variables.addPaymentPopoverRightSpacing,
anchorPositionHorizontal: position.x,
anchorPositionVertical: position.y,
});
},
[windowWidth],
);

const setMenuPosition = useCallback(() => {
if (!addPaymentMethodButton) {
return;
}
const buttonPosition = getClickedTargetLocation(addPaymentMethodButton);
setPositionAddPaymentMenu(buttonPosition);
}, [addPaymentMethodButton, setPositionAddPaymentMenu]);
Comment on lines 77 to -97

@huzaifa-99 huzaifa-99 Aug 5, 2023 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I replaced addPaymentMethodButton state with ref so this was unnecessary.

if (!paymentMethodButtonRef.current) return;

const position = getClickedTargetLocation(paymentMethodButtonRef.current);

setAnchorPosition({
anchorPositionTop: position.top + position.height + variables.addPaymentPopoverTopSpacing,

// We want the position to be 13px to the right of the left border
anchorPositionRight: windowWidth - position.right + variables.addPaymentPopoverRightSpacing,
anchorPositionHorizontal: position.x,
anchorPositionVertical: position.y,
});
}, [windowWidth]);

const getSelectedPaymentMethodID = useCallback(() => {
if (paymentMethod.selectedPaymentMethodType === CONST.PAYMENT_METHODS.PAYPAL) {
Expand Down Expand Up @@ -135,8 +128,7 @@ function BasePaymentsPage(props) {
* @param {String|Number} methodID
*/
const paymentMethodPressed = (nativeEvent, accountType, account, isDefault, methodID) => {
const position = getClickedTargetLocation(nativeEvent.currentTarget);
setAddPaymentMethodButton(nativeEvent.currentTarget);
paymentMethodButtonRef.current = nativeEvent.currentTarget;

// The delete/default menu
if (accountType) {
Expand Down Expand Up @@ -171,11 +163,11 @@ function BasePaymentsPage(props) {
methodID,
});
setShouldShowDefaultDeleteMenu(true);
setPositionAddPaymentMenu(position);
setMenuPosition();
return;
}
setShouldShowAddPaymentMenu(true);
setPositionAddPaymentMenu(position);
setMenuPosition();
};

/**
Expand Down Expand Up @@ -273,52 +265,55 @@ function BasePaymentsPage(props) {
setShouldShowDefaultDeleteMenu(false);
};

const listHeaderComponent = () => (
<>
{Permissions.canUseWallet(props.betas) && (
<>
<View style={[styles.mv5]}>
{shouldShowLoadingSpinner ? (
<ActivityIndicator
color={themeColors.spinner}
size="large"
/>
) : (
<OfflineWithFeedback
pendingAction={CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD}
errors={props.walletTerms.errors}
onClose={PaymentMethods.clearWalletTermsError}
errorRowStyles={[styles.ml10, styles.mr2]}
>
<CurrentWalletBalance />
</OfflineWithFeedback>
)}
</View>
{props.userWallet.currentBalance > 0 && (
<View style={styles.mb3}>
<KYCWall
onSuccessfulKYC={navigateToTransferBalancePage}
enablePaymentsRoute={ROUTES.SETTINGS_ENABLE_PAYMENTS}
addBankAccountRoute={ROUTES.SETTINGS_ADD_BANK_ACCOUNT}
addDebitCardRoute={ROUTES.SETTINGS_ADD_DEBIT_CARD}
popoverPlacement="bottom"
>
{(triggerKYCFlow) => (
<MenuItem
title={translate('common.transferBalance')}
icon={Expensicons.Transfer}
onPress={triggerKYCFlow}
shouldShowRightIcon
disabled={props.network.isOffline}
/>
)}
</KYCWall>
const listHeaderComponent = useCallback(
() => (
<>
{Permissions.canUseWallet(props.betas) && (
<>
<View style={[styles.mv5]}>
{shouldShowLoadingSpinner ? (
<ActivityIndicator
color={themeColors.spinner}
size="large"
/>
) : (
<OfflineWithFeedback
pendingAction={CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD}
errors={props.walletTerms.errors}
onClose={PaymentMethods.clearWalletTermsError}
errorRowStyles={[styles.ml10, styles.mr2]}
>
<CurrentWalletBalance />
</OfflineWithFeedback>
)}
</View>
)}
</>
)}
<Text style={[styles.ph5, styles.textLabelSupporting, styles.mb1]}>{translate('paymentsPage.paymentMethodsTitle')}</Text>
</>
{props.userWallet.currentBalance > 0 && (
<View style={styles.mb3}>
<KYCWall
onSuccessfulKYC={navigateToTransferBalancePage}
enablePaymentsRoute={ROUTES.SETTINGS_ENABLE_PAYMENTS}
addBankAccountRoute={ROUTES.SETTINGS_ADD_BANK_ACCOUNT}
addDebitCardRoute={ROUTES.SETTINGS_ADD_DEBIT_CARD}
popoverPlacement="bottom"
>
{(triggerKYCFlow) => (
<MenuItem
title={translate('common.transferBalance')}
icon={Expensicons.Transfer}
onPress={triggerKYCFlow}
shouldShowRightIcon
disabled={props.network.isOffline}
/>
)}
</KYCWall>
</View>
)}
</>
)}
<Text style={[styles.ph5, styles.textLabelSupporting, styles.mb1]}>{translate('paymentsPage.paymentMethodsTitle')}</Text>
</>
),
[props.betas, props.network.isOffline, props.userWallet.currentBalance, props.walletTerms.errors, shouldShowLoadingSpinner, translate],
);

useEffect(() => {
Expand Down Expand Up @@ -403,6 +398,7 @@ function BasePaymentsPage(props) {
activePaymentMethodID={shouldShowDefaultDeleteMenu ? getSelectedPaymentMethodID() : ''}
listHeaderComponent={listHeaderComponent}
buttonRef={addPaymentMethodAnchorRef}
onListContentSizeChange={shouldShowAddPaymentMenu || shouldShowDefaultDeleteMenu ? setMenuPosition : () => {}}
/>
</OfflineWithFeedback>
</View>
Expand Down