[No QA] Create new Edit Card Limit page #45397
There are no files selected for viewing
This file contains 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 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 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 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 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 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 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 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 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 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,153 @@ | ||
| import type {StackScreenProps} from '@react-navigation/stack'; | ||
| import React, {useCallback, useMemo, useState} from 'react'; | ||
| import {useOnyx} from 'react-native-onyx'; | ||
| import AmountForm from '@components/AmountForm'; | ||
| import ConfirmModal from '@components/ConfirmModal'; | ||
| import FormProvider from '@components/Form/FormProvider'; | ||
| import InputWrapper from '@components/Form/InputWrapper'; | ||
| import type {FormInputErrors, FormOnyxValues} from '@components/Form/types'; | ||
| import HeaderWithBackButton from '@components/HeaderWithBackButton'; | ||
| import ScreenWrapper from '@components/ScreenWrapper'; | ||
| import useAutoFocusInput from '@hooks/useAutoFocusInput'; | ||
| import useLocalize from '@hooks/useLocalize'; | ||
| import useThemeStyles from '@hooks/useThemeStyles'; | ||
| import * as CurrencyUtils from '@libs/CurrencyUtils'; | ||
| import * as ValidationUtils from '@libs/ValidationUtils'; | ||
| import Navigation from '@navigation/Navigation'; | ||
| import type {SettingsNavigatorParamList} from '@navigation/types'; | ||
| import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper'; | ||
| import CONST from '@src/CONST'; | ||
| import ONYXKEYS from '@src/ONYXKEYS'; | ||
| import type SCREENS from '@src/SCREENS'; | ||
| import INPUT_IDS from '@src/types/form/EditExpensifyCardLimitForm'; | ||
|
|
||
| type ConfirmationWarningTranslationPaths = 'workspace.expensifyCard.smartLimitWarning' | 'workspace.expensifyCard.monthlyLimitWarning' | 'workspace.expensifyCard.fixedLimitWarning'; | ||
|
|
||
| // TODO: remove when Onyx data is available | ||
| const mockedCard = { | ||
| accountID: 885646, | ||
| availableSpend: 1000, | ||
| nameValuePairs: { | ||
| cardTitle: 'Test 1', | ||
| isVirtual: true, | ||
| limit: 2000, | ||
| limitType: CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART, | ||
| }, | ||
| lastFourPAN: '1234', | ||
| }; | ||
|
|
||
| type WorkspaceEditCardLimitPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.EXPENSIFY_CARD_LIMIT>; | ||
|
|
||
| function WorkspaceEditCardLimitPage({route}: WorkspaceEditCardLimitPageProps) { | ||
| const {policyID, cardID} = route.params; | ||
| const {translate} = useLocalize(); | ||
| const {inputCallbackRef} = useAutoFocusInput(); | ||
| const styles = useThemeStyles(); | ||
| const [isConfirmModalVisible, setIsConfirmModalVisible] = useState(false); | ||
|
|
||
| const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${policyID}_${CONST.EXPENSIFY_CARD.BANK}`); | ||
| const card = cardsList?.[cardID] ?? mockedCard; | ||
|
|
||
| const getPromptTextKey = useMemo((): ConfirmationWarningTranslationPaths => { | ||
| switch (card.nameValuePairs?.limitType) { | ||
| case CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART: | ||
| return 'workspace.expensifyCard.smartLimitWarning'; | ||
| case CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED: | ||
| return 'workspace.expensifyCard.fixedLimitWarning'; | ||
| case CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY: | ||
| return 'workspace.expensifyCard.monthlyLimitWarning'; | ||
| default: | ||
| return 'workspace.expensifyCard.fixedLimitWarning'; | ||
| } | ||
| }, [card.nameValuePairs?.limitType]); | ||
|
|
||
| // eslint-disable-next-line @typescript-eslint/no-unused-vars | ||
| const updateCardLimit = (newLimit: string) => { | ||
| setIsConfirmModalVisible(false); | ||
|
|
||
| // TODO: add API call when it's supported https://github.com/Expensify/Expensify/issues/407831 | ||
|
|
||
| Navigation.goBack(); | ||
| }; | ||
|
|
||
| const submit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_LIMIT_FORM>) => { | ||
| const currentLimit = card.nameValuePairs?.limit ?? 0; | ||
| const currentSpend = currentLimit - card.availableSpend; | ||
| const newLimit = Number(values[INPUT_IDS.LIMIT]) * 100; | ||
| const newAvailableSpend = newLimit - currentSpend; | ||
|
|
||
| if (newAvailableSpend <= 0) { | ||
| setIsConfirmModalVisible(true); | ||
| return; | ||
| } | ||
|
|
||
| updateCardLimit(values[INPUT_IDS.LIMIT]); | ||
| }; | ||
|
|
||
| const validate = useCallback( | ||
| (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_LIMIT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_LIMIT_FORM> => { | ||
| const errors = ValidationUtils.getFieldRequiredErrors(values, [INPUT_IDS.LIMIT]); | ||
|
|
||
| // We only want integers to be sent as the limit | ||
| if (!Number(values.limit) || !Number.isInteger(Number(values.limit))) { | ||
|
There was a problem hiding this comment. NAB: I think we shouldn't allow users type decimal (can't type "." character). It would be better There was a problem hiding this comment. The same approach is used on the LimitStep page, see the explanation. So let's keep it this way for now |
||
| errors.limit = translate('iou.error.invalidAmount'); | ||
| } | ||
|
|
||
| return errors; | ||
| }, | ||
| [translate], | ||
| ); | ||
|
|
||
| return ( | ||
| <AccessOrNotFoundWrapper | ||
| accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]} | ||
| policyID={policyID} | ||
| featureName={CONST.POLICY.MORE_FEATURES.ARE_EXPENSIFY_CARDS_ENABLED} | ||
| > | ||
| <ScreenWrapper | ||
| testID={WorkspaceEditCardLimitPage.displayName} | ||
| shouldEnablePickerAvoiding={false} | ||
| shouldEnableMaxHeight | ||
| > | ||
| <HeaderWithBackButton title={translate('workspace.expensifyCard.cardLimit')} /> | ||
| <FormProvider | ||
VickyStash marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| formID={ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_LIMIT_FORM} | ||
| submitButtonText={translate('common.save')} | ||
| onSubmit={submit} | ||
| style={styles.flex1} | ||
| submitButtonStyles={[styles.mh5, styles.mt0]} | ||
| submitFlexEnabled={false} | ||
| enabledWhenOffline | ||
| validate={validate} | ||
| > | ||
| {({inputValues}) => ( | ||
| <> | ||
| <InputWrapper | ||
| InputComponent={AmountForm} | ||
| defaultValue={CurrencyUtils.convertToFrontendAmountAsString(card.nameValuePairs?.limit, CONST.CURRENCY.USD, false)} | ||
| isCurrencyPressable={false} | ||
| inputID={INPUT_IDS.LIMIT} | ||
| ref={inputCallbackRef} | ||
| /> | ||
| <ConfirmModal | ||
|
There was a problem hiding this comment. NAB, It is better to move There was a problem hiding this comment. @DylanDylann It was easier to pass form values to |
||
| title={translate('workspace.expensifyCard.changeCardLimit')} | ||
| isVisible={isConfirmModalVisible} | ||
| onConfirm={() => updateCardLimit(inputValues[INPUT_IDS.LIMIT])} | ||
| onCancel={() => setIsConfirmModalVisible(false)} | ||
| prompt={translate(getPromptTextKey, CurrencyUtils.convertToDisplayString(Number(inputValues[INPUT_IDS.LIMIT]) * 100, CONST.CURRENCY.USD))} | ||
| confirmText={translate('workspace.expensifyCard.changeLimit')} | ||
| cancelText={translate('common.cancel')} | ||
| danger | ||
| shouldEnableNewFocusManagement | ||
| /> | ||
| </> | ||
| )} | ||
| </FormProvider> | ||
| </ScreenWrapper> | ||
| </AccessOrNotFoundWrapper> | ||
| ); | ||
| } | ||
|
|
||
| WorkspaceEditCardLimitPage.displayName = 'WorkspaceEditCardLimitPage'; | ||
|
|
||
| export default WorkspaceEditCardLimitPage; | ||
This file contains 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 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,13 @@ | ||
| import type {ValueOf} from 'type-fest'; | ||
| import type Form from './Form'; | ||
|
|
||
| const INPUT_IDS = { | ||
| LIMIT: 'limit', | ||
| } as const; | ||
|
|
||
| type InputID = ValueOf<typeof INPUT_IDS>; | ||
|
|
||
| type EditExpensifyCardLimitForm = Form<InputID, {[INPUT_IDS.LIMIT]: string}>; | ||
|
|
||
| export type {EditExpensifyCardLimitForm}; | ||
| export default INPUT_IDS; |
This file contains 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.
The API endpoint
UpdateExpensifyCardLimitis live on staging, can we integrate it as part of this PR? :)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.
Sure, I will fo it!
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.
@MariaHCD Is it possible for me to test this endpoint over the realistic card in the E/App?
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.
Ah, no, not yet. The backend PR to configure a workspace for the Expensify Card is still WIP so we can't test any issuing cards or updating cards at this point.
We can do full E2E tests once more of the backend pieces are implemented.
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.
@MariaHCD I've made a call for non-existing card and it returned
200response. Is it okay?I expected something with
404😅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.
Integrated
UpdateExpensifyCardLimitAPI call: 5e31125There 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.
Ah, thanks for catching that. Looking at our backend logs, we did throw a
404but the API didn't rethrow the exception. cc: @nkuoch