[Internal QA] Expensify Card feed selector #59887
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| import React from 'react'; | ||
| import {View} from 'react-native'; | ||
| import useTheme from '@hooks/useTheme'; | ||
| import useThemeStyles from '@hooks/useThemeStyles'; | ||
| import variables from '@styles/variables'; | ||
| import type IconAsset from '@src/types/utils/IconAsset'; | ||
| import CaretWrapper from './CaretWrapper'; | ||
| import Icon from './Icon'; | ||
| import * as Expensicons from './Icon/Expensicons'; | ||
| import {PressableWithFeedback} from './Pressable'; | ||
| import Text from './Text'; | ||
|
|
||
| type Props = { | ||
| /** Function to call when the feed is selected */ | ||
| onFeedSelect: () => void; | ||
|
|
||
| /** Icon for the card */ | ||
| cardIcon: IconAsset; | ||
|
|
||
| /** Whether to show assign card button */ | ||
| shouldChangeLayout?: boolean; | ||
|
|
||
| /** Feed name */ | ||
| feedName?: string; | ||
|
|
||
| /** Supporting text */ | ||
| supportingText?: string; | ||
|
|
||
| /** Whether the RBR indicator should be shown */ | ||
| shouldShowRBR?: boolean; | ||
| }; | ||
|
|
||
| function FeedSelector({onFeedSelect, cardIcon, shouldChangeLayout, feedName, supportingText, shouldShowRBR = false}: Props) { | ||
| const styles = useThemeStyles(); | ||
| const theme = useTheme(); | ||
|
|
||
| return ( | ||
| <PressableWithFeedback | ||
| onPress={onFeedSelect} | ||
| style={[styles.flexRow, styles.alignItemsCenter, styles.gap3, shouldChangeLayout && styles.mb3]} | ||
| accessibilityLabel={feedName ?? ''} | ||
| > | ||
| <Icon | ||
| src={cardIcon} | ||
| height={variables.cardIconHeight} | ||
| width={variables.cardIconWidth} | ||
| additionalStyles={styles.cardIcon} | ||
| /> | ||
| <View style={styles.flex1}> | ||
| <View style={[styles.flexRow, styles.gap1]}> | ||
| <CaretWrapper style={styles.flex1}> | ||
| <Text style={[styles.textStrong, styles.flexShrink1]}>{feedName}</Text> | ||
| </CaretWrapper> | ||
| {shouldShowRBR && ( | ||
| <Icon | ||
| src={Expensicons.DotIndicator} | ||
| fill={theme.danger} | ||
| /> | ||
| )} | ||
| </View> | ||
| <Text style={styles.textLabelSupporting}>{supportingText}</Text> | ||
| </View> | ||
| </PressableWithFeedback> | ||
| ); | ||
| } | ||
|
|
||
| export default FeedSelector; | ||
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 |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| import {useOnyx} from 'react-native-onyx'; | ||
| import {getFundIdFromSettingsKey} from '@libs/CardUtils'; | ||
| import CONST from '@src/CONST'; | ||
| import ONYXKEYS from '@src/ONYXKEYS'; | ||
| import useWorkspaceAccountID from './useWorkspaceAccountID'; | ||
|
|
||
| /** | ||
| * Hook to get the default fundID for a given policyID. This is used to get the settings and cards for each of the feeds. | ||
| * It will always return lastSelectedExpensifyCardFeed if it exists or fallback to the workspaceAccountID or domainFundID. | ||
| */ | ||
| function useDefaultFundID(policyID: string | undefined) { | ||
|
puneetlath marked this conversation as resolved.
|
||
| const workspaceAccountID = useWorkspaceAccountID(policyID); | ||
| const [lastSelectedExpensifyCardFeed] = useOnyx(`${ONYXKEYS.COLLECTION.LAST_SELECTED_EXPENSIFY_CARD_FEED}${policyID}`); | ||
|
|
||
| const [domainFundID] = useOnyx(ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS, { | ||
| selector: (cardSettings) => { | ||
| const matchingKey = Object.entries(cardSettings ?? {}).find( | ||
| // eslint-disable-next-line @typescript-eslint/no-unused-vars | ||
| ([key, settings]) => settings?.preferredPolicy && settings.preferredPolicy === policyID && !key.includes(workspaceAccountID.toString()), | ||
| ); | ||
|
|
||
| return getFundIdFromSettingsKey(matchingKey?.[0] ?? ''); | ||
| }, | ||
| }); | ||
|
|
||
| if (lastSelectedExpensifyCardFeed) { | ||
|
Contributor
There was a problem hiding this comment. I think we should also consider |
||
| return lastSelectedExpensifyCardFeed; | ||
| } | ||
|
|
||
| if (workspaceAccountID) { | ||
| return workspaceAccountID; | ||
| } | ||
|
|
||
| return domainFundID ?? CONST.DEFAULT_NUMBER_ID; | ||
| } | ||
|
|
||
| export default useDefaultFundID; | ||
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 |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| import {useOnyx} from 'react-native-onyx'; | ||
| import ONYXKEYS from '@src/ONYXKEYS'; | ||
|
|
||
| function useExpensifyCardFeeds(policyID: string | undefined) { | ||
| const [allExpensifyCardFeeds] = useOnyx(ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS, { | ||
| selector: (cardSettings) => { | ||
| const matchingEntries = Object.entries(cardSettings ?? {}).filter( | ||
| // eslint-disable-next-line @typescript-eslint/no-unused-vars | ||
| ([_, settings]) => settings?.preferredPolicy && settings.preferredPolicy === policyID, | ||
| ); | ||
|
|
||
| return Object.fromEntries(matchingEntries); | ||
| }, | ||
| }); | ||
|
|
||
| return allExpensifyCardFeeds; | ||
| } | ||
|
|
||
| export default useExpensifyCardFeeds; |
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
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
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.
Came from this issue
We had an issue where the Card feed name is displayed partially with a blank space on Android 16
More context here