Update the Assigned Cards Section of the Wallet Page #38998
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,7 +19,7 @@ import * as CardUtils from '@libs/CardUtils'; | |
| import * as DeviceCapabilities from '@libs/DeviceCapabilities'; | ||
| import * as ErrorUtils from '@libs/ErrorUtils'; | ||
| import Navigation from '@libs/Navigation/Navigation'; | ||
| import type {SettingsNavigatorParamList} from '@libs/Navigation/types'; | ||
| import NotFoundPage from '@pages/ErrorPage/NotFoundPage'; | ||
| import * as CardSettings from '@userActions/Card'; | ||
| import CONST from '@src/CONST'; | ||
|
|
@@ -34,15 +34,15 @@ type ActivatePhysicalCardPageOnyxProps = { | |
| cardList: OnyxEntry<Record<string, Card>>; | ||
| }; | ||
|
|
||
| type ActivatePhysicalCardPageProps = ActivatePhysicalCardPageOnyxProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.WALLET.CARD_ACTIVATE>; | ||
grgia marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| const LAST_FOUR_DIGITS_LENGTH = 4; | ||
| const MAGIC_INPUT_MIN_HEIGHT = 86; | ||
|
|
||
| function ActivatePhysicalCardPage({ | ||
| cardList, | ||
| route: { | ||
| params: {domain = '', cardId = ''}, | ||
| }, | ||
| }: ActivatePhysicalCardPageProps) { | ||
| const theme = useTheme(); | ||
|
|
@@ -56,8 +56,7 @@ function ActivatePhysicalCardPage({ | |
| const [lastPressedDigit, setLastPressedDigit] = useState(''); | ||
|
|
||
| const domainCards = CardUtils.getDomainCards(cardList)[domain] ?? []; | ||
| const physicalCard = domainCards.find((card) => card?.state === CONST.EXPENSIFY_CARD.STATE.NOT_ACTIVATED); | ||
|
There was a problem hiding this comment. Don’t we have to also add the check for There was a problem hiding this comment. Only physical Card can be in NOT_ACTIVATED state. I was also wondering about, ff it's more readable to add isVirtual check, but decided to skip it since it's redundant. What do you think? There was a problem hiding this comment. Ok. Got it. Since NOT_ACTIVATED state is only for physical card, it is fine not to add a redundant check. |
||
| const cardError = ErrorUtils.getLatestErrorMessage(physicalCard ?? {}); | ||
|
|
||
| const activateCardCodeInputRef = useRef<MagicCodeInputHandle>(null); | ||
|
|
@@ -66,19 +65,18 @@ function ActivatePhysicalCardPage({ | |
| * If state of the card is CONST.EXPENSIFY_CARD.STATE.OPEN, navigate to card details screen. | ||
| */ | ||
| useEffect(() => { | ||
| if (physicalCard?.state !== CONST.EXPENSIFY_CARD.STATE.OPEN || physicalCard?.isLoading) { | ||
| return; | ||
| } | ||
|
|
||
| Navigation.navigate(ROUTES.SETTINGS_WALLET_DOMAINCARD.getRoute(domain, cardId)); | ||
| }, [cardId, cardList, domain, physicalCard?.isLoading, physicalCard?.state]); | ||
|
|
||
| useEffect( | ||
| () => () => { | ||
| CardSettings.clearCardListErrors(physicalCard?.cardID ?? 0); | ||
|
There was a problem hiding this comment. Hmm do we want to default to 0 here? It looks like it would merge 0 into the cardList There was a problem hiding this comment. Maybe not though? would 0: {} work? There was a problem hiding this comment. I could just do if and an early return. Dunno why I didn't think of that. Defaulting to 0 would probably cause bugs 😄 There was a problem hiding this comment. Yeah let's do an early return instead |
||
| }, | ||
| [physicalCard?.cardID], | ||
| ); | ||
|
|
||
| /** | ||
|
|
@@ -96,7 +94,7 @@ function ActivatePhysicalCardPage({ | |
| setFormError(''); | ||
|
|
||
| if (cardError) { | ||
| CardSettings.clearCardListErrors(physicalCard?.cardID ?? 0); | ||
| } | ||
|
|
||
| setLastFourDigits(text); | ||
|
|
@@ -110,8 +108,8 @@ function ActivatePhysicalCardPage({ | |
| return; | ||
| } | ||
|
|
||
| CardSettings.activatePhysicalExpensifyCard(lastFourDigits, physicalCard?.cardID ?? 0); | ||
| }, [lastFourDigits, physicalCard?.cardID]); | ||
|
There was a problem hiding this comment. Maybe we should default to a negative ID There was a problem hiding this comment. We could but isn't 0 also a wrong card ID and would cause There was a problem hiding this comment. Yeah 0 is an incorrect card ID. I think we've historically used -1 but I need to double check. But let me know if you'll try returning early instead |
||
|
|
||
| if (isEmptyObject(physicalCard)) { | ||
| return <NotFoundPage />; | ||
|
|
@@ -120,7 +118,7 @@ function ActivatePhysicalCardPage({ | |
| return ( | ||
| <IllustratedHeaderPageLayout | ||
| title={translate('activateCardPage.activateCard')} | ||
| onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WALLET_DOMAINCARD.getRoute(domain, cardId))} | ||
| backgroundColor={theme.PAGE_THEMES[SCREENS.SETTINGS.PREFERENCES.ROOT].backgroundColor} | ||
| illustration={LottieAnimations.Magician} | ||
| scrollViewContainerStyles={[styles.mnh100]} | ||
|
|
||
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 miss translation for the names i.e.
Smart limit,Fixed limit,Monthly limit? Or was this intentional?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.
Asked @grgia about it 😄