Add view transactions cta to Expensify card and company cards page #55095
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,14 +27,26 @@ import variables from '@styles/variables'; | |
| import CONST from '@src/CONST'; | ||
| import ONYXKEYS from '@src/ONYXKEYS'; | ||
| import ROUTES from '@src/ROUTES'; | ||
| import type {AccountData, Card, CompanyCardFeed} from '@src/types/onyx'; | ||
| import type {BankIcon} from '@src/types/onyx/Bank'; | ||
| import type {Errors} from '@src/types/onyx/OnyxCommon'; | ||
| import type PaymentMethod from '@src/types/onyx/PaymentMethod'; | ||
| import type {FilterMethodPaymentType} from '@src/types/onyx/WalletTransfer'; | ||
| import {isEmptyObject} from '@src/types/utils/EmptyObject'; | ||
| import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue'; | ||
|
|
||
| type PaymentMethodPressHandler = ( | ||
| event?: GestureResponderEvent | KeyboardEvent, | ||
| accountType?: string, | ||
| accountData?: AccountData, | ||
| icon?: FormattedSelectedPaymentMethodIcon, | ||
| isDefault?: boolean, | ||
| methodID?: number, | ||
| description?: string, | ||
| ) => void; | ||
|
|
||
| type CardPressHandler = (event?: GestureResponderEvent | KeyboardEvent, cardData?: Card, icon?: FormattedSelectedPaymentMethodIcon, cardID?: number) => void; | ||
|
|
||
| type PaymentMethodListProps = { | ||
| /** Type of active/highlighted payment method */ | ||
| actionPaymentMethodType?: string; | ||
|
|
@@ -88,15 +100,7 @@ type PaymentMethodListProps = { | |
| shouldShowRightIcon?: boolean; | ||
|
|
||
| /** What to do when a menu item is pressed */ | ||
| onPress: PaymentMethodPressHandler | CardPressHandler; | ||
|
|
||
| /** The policy invoice's transfer bank accountID */ | ||
| invoiceTransferBankAccountID?: number; | ||
|
|
@@ -214,13 +218,14 @@ function PaymentMethodList({ | |
| const icon = getCardFeedIcon(card.bank as CompanyCardFeed); | ||
|
|
||
| if (!isExpensifyCard(card.cardID)) { | ||
| const pressHandler = onPress as CardPressHandler; | ||
| assignedCardsGrouped.push({ | ||
| key: card.cardID.toString(), | ||
| title: maskCardNumber(card.cardName, card.bank), | ||
| description: getDescriptionForPolicyDomainCard(card.domainName), | ||
| interactive: true, | ||
|
Contributor
There was a problem hiding this comment. Came from this issue |
||
| canDismissError: false, | ||
| shouldShowRightIcon, | ||
| errors: card.errors, | ||
| pendingAction: card.pendingAction, | ||
| brickRoadIndicator: | ||
|
|
@@ -231,6 +236,20 @@ function PaymentMethodList({ | |
| iconStyles: [styles.cardIcon], | ||
| iconWidth: variables.cardIconWidth, | ||
| iconHeight: variables.cardIconHeight, | ||
| iconRight: Expensicons.ThreeDots, | ||
| isMethodActive: activePaymentMethodID === card.cardID, | ||
| onPress: (e: GestureResponderEvent | KeyboardEvent | undefined) => | ||
| pressHandler( | ||
| e, | ||
| card, | ||
| { | ||
| icon, | ||
| iconStyles: [styles.cardIcon], | ||
| iconWidth: variables.cardIconWidth, | ||
| iconHeight: variables.cardIconHeight, | ||
| }, | ||
| card.cardID, | ||
| ), | ||
| }); | ||
| return; | ||
| } | ||
|
|
@@ -294,11 +313,12 @@ function PaymentMethodList({ | |
| ); | ||
| } | ||
| combinedPaymentMethods = combinedPaymentMethods.map((paymentMethod) => { | ||
| const pressHandler = onPress as PaymentMethodPressHandler; | ||
| const isMethodActive = isPaymentMethodActive(actionPaymentMethodType, activePaymentMethodID, paymentMethod); | ||
| return { | ||
| ...paymentMethod, | ||
| onPress: (e: GestureResponderEvent) => | ||
| pressHandler( | ||
| e, | ||
| paymentMethod.accountType, | ||
| paymentMethod.accountData, | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did we confirm this translation ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes.