Skip to content

Personal bank account option is not present in Pay with Expensify menu #32423

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
mountiny merged 7 commits into from
Dec 14, 2023
Merged

Personal bank account option is not present in Pay with Expensify menu #32423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b75b477
Bank account option is not present in Pay with Expensify menu
dukenv0307 Dec 4, 2023
578ede3
Merge branch 'main' into fix/32228
dukenv0307 Dec 6, 2023
380f563
add Personal bank account option to the IOU report
dukenv0307 Dec 6, 2023
1bf2f26
Merge branch 'main' into fix/32228
dukenv0307 Dec 11, 2023
ca929fb
pass iouType to SettlementButton
dukenv0307 Dec 11, 2023
5e49d8b
Merge branch 'main' into fix/32228
dukenv0307 Dec 14, 2023
eaf6d53
clean code
dukenv0307 Dec 14, 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
10 changes: 8 additions & 2 deletions src/components/AddPaymentMethodMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ const propTypes = {
/** Currently logged in user accountID */
accountID: PropTypes.number,
}),

/** Whether the personal bank account option should be shown */
shouldShowPersonalBankAccountOption: PropTypes.bool,
};

const defaultProps = {
Expand All @@ -59,9 +62,10 @@ const defaultProps = {
},
anchorRef: () => {},
session: {},
shouldShowPersonalBankAccountOption: false,
};

function AddPaymentMethodMenu({isVisible, onClose, anchorPosition, anchorAlignment, anchorRef, iouReport, onItemSelected, session}) {
function AddPaymentMethodMenu({isVisible, onClose, anchorPosition, anchorAlignment, anchorRef, iouReport, onItemSelected, session, shouldShowPersonalBankAccountOption}) {
const {translate} = useLocalize();

// Users can choose to pay with business bank account in case of Expense reports or in case of P2P IOU report
Expand All @@ -70,6 +74,8 @@ function AddPaymentMethodMenu({isVisible, onClose, anchorPosition, anchorAlignme
ReportUtils.isExpenseReport(iouReport) ||
(ReportUtils.isIOUReport(iouReport) && !ReportActionsUtils.hasRequestFromCurrentAccount(lodashGet(iouReport, 'reportID', 0), lodashGet(session, 'accountID', 0)));

const canUsePersonalBankAccount = shouldShowPersonalBankAccountOption || ReportUtils.isIOUReport(iouReport);

return (
<PopoverMenu
isVisible={isVisible}
Expand All @@ -79,7 +85,7 @@ function AddPaymentMethodMenu({isVisible, onClose, anchorPosition, anchorAlignme
anchorRef={anchorRef}
onItemSelected={onClose}
menuItems={[
...(ReportUtils.isIOUReport(iouReport)
...(canUsePersonalBankAccount
? [
{
text: translate('common.personalBankAccount'),
Expand Down
2 changes: 2 additions & 0 deletions src/components/KYCWall/BaseKYCWall.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ function KYCWall({
source,
userWallet,
walletTerms,
shouldShowPersonalBankAccountOption,
}) {
const anchorRef = useRef(null);
const transferBalanceButtonRef = useRef(null);
Expand Down Expand Up @@ -213,6 +214,7 @@ function KYCWall({
setShouldShowAddPaymentMenu(false);
selectPaymentMethod(item);
}}
shouldShowPersonalBankAccountOption={shouldShowPersonalBankAccountOption}
/>
{children(continueAction, anchorRef)}
</>
Expand Down
4 changes: 4 additions & 0 deletions src/components/KYCWall/kycWallPropTypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ const propTypes = {

/** Callback for when a payment method has been selected */
onSelectPaymentMethod: PropTypes.func,

/** Whether the personal bank account option should be shown */
shouldShowPersonalBankAccountOption: PropTypes.bool,
};

const defaultProps = {
Expand All @@ -82,6 +85,7 @@ const defaultProps = {
},
shouldIncludeDebitCard: true,
onSelectPaymentMethod: () => {},
shouldShowPersonalBankAccountOption: false,
};

export {propTypes, defaultProps};
1 change: 1 addition & 0 deletions src/components/MoneyRequestConfirmationList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,6 +521,7 @@ function MoneyRequestConfirmationList(props) {
horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
}}
shouldShowPersonalBankAccountOption
/>
) : (
<ButtonWithDropdownMenu
Expand Down
6 changes: 6 additions & 0 deletions src/components/SettlementButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ const propTypes = {
horizontal: PropTypes.oneOf(_.values(CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL)),
vertical: PropTypes.oneOf(_.values(CONST.MODAL.ANCHOR_ORIGIN_VERTICAL)),
}),

/** Whether the personal bank account option should be shown */
shouldShowPersonalBankAccountOption: PropTypes.bool,
};

const defaultProps = {
Expand Down Expand Up @@ -110,6 +113,7 @@ const defaultProps = {
horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT, // caret for dropdown is at right, so horizontal anchor is at RIGHT
vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP, // we assume that popover menu opens below the button, anchor is at TOP
},
shouldShowPersonalBankAccountOption: false,
};

function SettlementButton({
Expand All @@ -132,6 +136,7 @@ function SettlementButton({
shouldHidePaymentOptions,
shouldShowApproveButton,
style,
shouldShowPersonalBankAccountOption,
}) {
const {translate} = useLocalize();
const {isOffline} = useNetwork();
Expand Down Expand Up @@ -220,6 +225,7 @@ function SettlementButton({
chatReportID={chatReportID}
iouReport={iouReport}
anchorAlignment={kycWallAnchorAlignment}
shouldShowPersonalBankAccountOption={shouldShowPersonalBankAccountOption}
>
{(triggerKYCFlow, buttonRef) => (
<ButtonWithDropdownMenu
Expand Down