Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 8 additions & 5 deletions src/pages/workspace/companyCards/WorkspaceCompanyCardsList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,14 @@ function WorkspaceCompanyCardsList({cardsList, policyID, handleAssignCard, isDis
Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARD_DETAILS.getRoute(policyID, cardID, item.bank));
}}
>
<WorkspaceCompanyCardsListRow
cardholder={personalDetails?.[item.accountID ?? CONST.DEFAULT_NUMBER_ID]}
cardNumber={item.lastFourPAN ?? ''}
name={customCardNames?.[item.cardID] ?? getDefaultCardName(personalDetails?.[item.accountID ?? CONST.DEFAULT_NUMBER_ID]?.firstName)}
/>
{({hovered}) => (
<WorkspaceCompanyCardsListRow
cardholder={personalDetails?.[item.accountID ?? CONST.DEFAULT_NUMBER_ID]}
cardNumber={item.lastFourPAN ?? ''}
name={customCardNames?.[item.cardID] ?? getDefaultCardName(personalDetails?.[item.accountID ?? CONST.DEFAULT_NUMBER_ID]?.firstName)}
isHovered={hovered}
/>
)}
</PressableWithFeedback>
</OfflineWithFeedback>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@ type WorkspaceCompanyCardsListRowProps = {

/** Cardholder personal details */
cardholder?: PersonalDetails | null;

/** Whether the list item is hovered */
isHovered?: boolean;
};

function WorkspaceCompanyCardsListRow({cardholder, name, cardNumber}: WorkspaceCompanyCardsListRowProps) {
function WorkspaceCompanyCardsListRow({cardholder, name, cardNumber, isHovered}: WorkspaceCompanyCardsListRowProps) {
const styles = useThemeStyles();
const cardholderName = useMemo(() => getDisplayNameOrDefault(cardholder), [cardholder]);
const theme = useTheme();
Expand Down Expand Up @@ -62,7 +65,7 @@ function WorkspaceCompanyCardsListRow({cardholder, name, cardNumber}: WorkspaceC
<Icon
src={Expensicons.ArrowRight}
fill={theme.icon}
additionalStyles={[styles.alignSelfCenter]}
additionalStyles={[styles.alignSelfCenter, !isHovered && styles.opacitySemiTransparent]}
medium
isButtonIcon
/>
Expand Down
7 changes: 5 additions & 2 deletions src/pages/workspace/expensifyCard/WorkspaceCardListRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,12 @@ type WorkspacesListRowProps = {

/** Type of card */
isVirtual: boolean;

/** Whether the list item is hovered */
isHovered?: boolean;
};

function WorkspaceCardListRow({limit, cardholder, lastFourPAN, name, currency, isVirtual}: WorkspacesListRowProps) {
function WorkspaceCardListRow({limit, cardholder, lastFourPAN, name, currency, isVirtual, isHovered}: WorkspacesListRowProps) {
const {shouldUseNarrowLayout} = useResponsiveLayout();
const styles = useThemeStyles();
const {translate} = useLocalize();
Expand Down Expand Up @@ -118,7 +121,7 @@ function WorkspaceCardListRow({limit, cardholder, lastFourPAN, name, currency, i
<Icon
src={Expensicons.ArrowRight}
fill={theme.icon}
additionalStyles={[styles.alignSelfCenter]}
additionalStyles={[styles.alignSelfCenter, !isHovered && styles.opacitySemiTransparent]}
medium
isButtonIcon
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,14 +162,17 @@ function WorkspaceExpensifyCardListPage({route, cardsList, fundID}: WorkspaceExp
hoverStyle={[styles.hoveredComponentBG]}
onPress={() => Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD_DETAILS.getRoute(policyID, item.cardID.toString()))}
>
<WorkspaceCardListRow
lastFourPAN={item.lastFourPAN ?? ''}
cardholder={personalDetails?.[item.accountID ?? CONST.DEFAULT_NUMBER_ID]}
limit={item.nameValuePairs?.unapprovedExpenseLimit ?? 0}
name={item.nameValuePairs?.cardTitle ?? ''}
currency={settlementCurrency}
isVirtual={!!item.nameValuePairs?.isVirtual}
/>
{({hovered}) => (
<WorkspaceCardListRow
lastFourPAN={item.lastFourPAN ?? ''}
cardholder={personalDetails?.[item.accountID ?? CONST.DEFAULT_NUMBER_ID]}
limit={item.nameValuePairs?.unapprovedExpenseLimit ?? 0}
name={item.nameValuePairs?.cardTitle ?? ''}
currency={settlementCurrency}
isVirtual={!!item.nameValuePairs?.isVirtual}
isHovered={hovered}
/>
)}
</PressableWithFeedback>
</OfflineWithFeedback>
),
Expand Down
Loading