-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
97d6d87
commit 91959fb
Showing
15 changed files
with
594 additions
and
223 deletions.
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
84 changes: 84 additions & 0 deletions
84
src/components/AddPaymentCard/PaymentCardCurrencyModal.tsx
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,84 @@ | ||
import React, {useMemo} from 'react'; | ||
import HeaderWithBackButton from '@components/HeaderWithBackButton'; | ||
import Modal from '@components/Modal'; | ||
import ScreenWrapper from '@components/ScreenWrapper'; | ||
import SelectionList from '@components/SelectionList'; | ||
import RadioListItem from '@components/SelectionList/RadioListItem'; | ||
import useLocalize from '@hooks/useLocalize'; | ||
import useThemeStyles from '@hooks/useThemeStyles'; | ||
import CONST from '@src/CONST'; | ||
|
||
type PaymentCardCurrencyModalProps = { | ||
/** Whether the modal is visible */ | ||
isVisible: boolean; | ||
|
||
/** The list of years to render */ | ||
currencies: Array<keyof typeof CONST.CURRENCY>; | ||
|
||
/** Currently selected year */ | ||
currentCurrency: keyof typeof CONST.CURRENCY; | ||
|
||
/** Function to call when the user selects a year */ | ||
onCurrencyChange?: (currency: keyof typeof CONST.CURRENCY) => void; | ||
|
||
/** Function to call when the user closes the year picker */ | ||
onClose?: () => void; | ||
}; | ||
|
||
function PaymentCardCurrencyModal({isVisible, currencies, currentCurrency = CONST.CURRENCY.USD, onCurrencyChange, onClose}: PaymentCardCurrencyModalProps) { | ||
const styles = useThemeStyles(); | ||
const {translate} = useLocalize(); | ||
const {sections} = useMemo( | ||
() => ({ | ||
sections: [ | ||
{ | ||
data: currencies.map((currency) => ({ | ||
text: currency, | ||
value: currency, | ||
keyForList: currency, | ||
isSelected: currency === currentCurrency, | ||
})), | ||
}, | ||
], | ||
}), | ||
[currencies, currentCurrency], | ||
); | ||
|
||
return ( | ||
<Modal | ||
type={CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED} | ||
isVisible={isVisible} | ||
onClose={() => onClose?.()} | ||
onModalHide={onClose} | ||
hideModalContentWhileAnimating | ||
useNativeDriver | ||
> | ||
<ScreenWrapper | ||
style={[styles.pb0]} | ||
includePaddingTop={false} | ||
includeSafeAreaPaddingBottom={false} | ||
testID={PaymentCardCurrencyModal.displayName} | ||
> | ||
<HeaderWithBackButton | ||
title={translate('common.currency')} | ||
onBackButtonPress={onClose} | ||
/> | ||
<SelectionList | ||
sections={sections} | ||
onSelectRow={(option) => { | ||
onCurrencyChange?.(option.value); | ||
}} | ||
initiallyFocusedOptionKey={currentCurrency} | ||
showScrollIndicator | ||
shouldStopPropagation | ||
shouldUseDynamicMaxToRenderPerBatch | ||
ListItem={RadioListItem} | ||
/> | ||
</ScreenWrapper> | ||
</Modal> | ||
); | ||
} | ||
|
||
PaymentCardCurrencyModal.displayName = 'PaymentCardCurrencyModal'; | ||
|
||
export default PaymentCardCurrencyModal; |
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,274 @@ | ||
import {useRoute} from '@react-navigation/native'; | ||
import React, {useCallback, useRef, useState} from 'react'; | ||
import type {ReactNode} from 'react'; | ||
import {View} from 'react-native'; | ||
import AddressSearch from '@components/AddressSearch'; | ||
import CheckboxWithLabel from '@components/CheckboxWithLabel'; | ||
import FormProvider from '@components/Form/FormProvider'; | ||
import InputWrapper from '@components/Form/InputWrapper'; | ||
import type {FormInputErrors, FormOnyxValues} from '@components/Form/types'; | ||
import Hoverable from '@components/Hoverable'; | ||
import * as Expensicons from '@components/Icon/Expensicons'; | ||
import type {AnimatedTextInputRef} from '@components/RNTextInput'; | ||
import StateSelector from '@components/StateSelector'; | ||
import Text from '@components/Text'; | ||
import TextInput from '@components/TextInput'; | ||
import TextLink from '@components/TextLink'; | ||
import useLocalize from '@hooks/useLocalize'; | ||
import useThemeStyles from '@hooks/useThemeStyles'; | ||
import * as ValidationUtils from '@libs/ValidationUtils'; | ||
import CONST from '@src/CONST'; | ||
import ONYXKEYS from '@src/ONYXKEYS'; | ||
import ROUTES from '@src/ROUTES'; | ||
import SCREENS from '@src/SCREENS'; | ||
import INPUT_IDS from '@src/types/form/AddDebitCardForm'; | ||
import PaymentCardCurrencyModal from './PaymentCardCurrencyModal'; | ||
|
||
type PaymentCardFormProps = { | ||
shouldShowPaymentCardForm?: boolean; | ||
showAcceptTerms?: boolean; | ||
showAddressField?: boolean; | ||
showCurrencyField?: boolean; | ||
showStateSelector?: boolean; | ||
isDebitCard?: boolean; | ||
addPaymentCard: (values: FormOnyxValues<typeof ONYXKEYS.FORMS.ADD_DEBIT_CARD_FORM>) => void; | ||
submitButtonText: string; | ||
/** Custom content to display in the footer after card form */ | ||
footerContent?: ReactNode; | ||
/** Custom content to display in the footer before card form */ | ||
headerContent?: ReactNode; | ||
}; | ||
|
||
function IAcceptTheLabel() { | ||
const {translate} = useLocalize(); | ||
|
||
return ( | ||
<Text> | ||
{`${translate('common.iAcceptThe')}`} | ||
<TextLink href={CONST.TERMS_URL}>{`${translate('common.addCardTermsOfService')}`}</TextLink> {`${translate('common.and')}`} | ||
<TextLink href={CONST.PRIVACY_URL}> {` ${translate('common.privacyPolicy')} `}</TextLink> | ||
</Text> | ||
); | ||
} | ||
|
||
function IAcceptDebitTheLabel() { | ||
const {translate} = useLocalize(); | ||
|
||
return ( | ||
<Text> | ||
{`${translate('common.iAcceptThe')}`} | ||
<TextLink href={CONST.TERMS_URL}>{`${translate('common.expensifyTermsOfService')}`}</TextLink> | ||
</Text> | ||
); | ||
} | ||
|
||
const REQUIRED_FIELDS = [ | ||
INPUT_IDS.NAME_ON_CARD, | ||
INPUT_IDS.CARD_NUMBER, | ||
INPUT_IDS.EXPIRATION_DATE, | ||
INPUT_IDS.ADDRESS_STREET, | ||
INPUT_IDS.SECURITY_CODE, | ||
INPUT_IDS.ADDRESS_ZIP_CODE, | ||
INPUT_IDS.ADDRESS_STATE, | ||
]; | ||
|
||
function PaymentCardForm({ | ||
shouldShowPaymentCardForm, | ||
addPaymentCard, | ||
showAcceptTerms, | ||
showAddressField, | ||
showCurrencyField, | ||
isDebitCard, | ||
submitButtonText, | ||
showStateSelector, | ||
footerContent, | ||
headerContent, | ||
}: PaymentCardFormProps) { | ||
const styles = useThemeStyles(); | ||
const {translate} = useLocalize(); | ||
const route = useRoute(); | ||
|
||
const cardNumberRef = useRef<AnimatedTextInputRef>(null); | ||
|
||
const [isCurrencyModalVisible, setIsCurrencyModalVisible] = useState(false); | ||
const [currency, setCurrency] = useState<keyof typeof CONST.CURRENCY>(CONST.CURRENCY.USD); | ||
|
||
const validate = (formValues: FormOnyxValues<typeof ONYXKEYS.FORMS.ADD_DEBIT_CARD_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.ADD_DEBIT_CARD_FORM> => { | ||
const errors = ValidationUtils.getFieldRequiredErrors(formValues, REQUIRED_FIELDS); | ||
|
||
if (formValues.nameOnCard && !ValidationUtils.isValidLegalName(formValues.nameOnCard)) { | ||
errors.nameOnCard = 'addDebitCardPage.error.invalidName'; | ||
} | ||
|
||
if (formValues.cardNumber && !ValidationUtils.isValidDebitCard(formValues.cardNumber.replace(/ /g, ''))) { | ||
errors.cardNumber = 'addDebitCardPage.error.debitCardNumber'; | ||
} | ||
|
||
if (formValues.expirationDate && !ValidationUtils.isValidExpirationDate(formValues.expirationDate)) { | ||
errors.expirationDate = 'addDebitCardPage.error.expirationDate'; | ||
} | ||
|
||
if (formValues.securityCode && !ValidationUtils.isValidSecurityCode(formValues.securityCode)) { | ||
errors.securityCode = 'addDebitCardPage.error.securityCode'; | ||
} | ||
|
||
if (formValues.addressStreet && !ValidationUtils.isValidAddress(formValues.addressStreet)) { | ||
errors.addressStreet = 'addDebitCardPage.error.addressStreet'; | ||
} | ||
|
||
if (formValues.addressZipCode && !ValidationUtils.isValidZipCode(formValues.addressZipCode)) { | ||
errors.addressZipCode = 'addDebitCardPage.error.addressZipCode'; | ||
} | ||
|
||
if (!formValues.acceptTerms) { | ||
errors.acceptTerms = 'common.error.acceptTerms'; | ||
} | ||
|
||
return errors; | ||
}; | ||
|
||
const showCurrenciesModal = useCallback(() => { | ||
setIsCurrencyModalVisible(true); | ||
}, []); | ||
|
||
const changeCurrency = useCallback((newCurrency: keyof typeof CONST.CURRENCY) => { | ||
setCurrency(newCurrency); | ||
setIsCurrencyModalVisible(false); | ||
}, []); | ||
|
||
if (!shouldShowPaymentCardForm) { | ||
return null; | ||
} | ||
|
||
return ( | ||
<> | ||
{headerContent} | ||
<FormProvider | ||
formID={ONYXKEYS.FORMS.ADD_DEBIT_CARD_FORM} | ||
validate={validate} | ||
onSubmit={addPaymentCard} | ||
submitButtonText={submitButtonText} | ||
scrollContextEnabled | ||
style={[styles.mh5, styles.flexGrow1]} | ||
> | ||
<InputWrapper | ||
InputComponent={TextInput} | ||
inputID={INPUT_IDS.CARD_NUMBER} | ||
label={translate('addDebitCardPage.debitCardNumber')} | ||
aria-label={translate('addDebitCardPage.debitCardNumber')} | ||
role={CONST.ROLE.PRESENTATION} | ||
ref={cardNumberRef} | ||
inputMode={CONST.INPUT_MODE.NUMERIC} | ||
/> | ||
<InputWrapper | ||
InputComponent={TextInput} | ||
inputID={INPUT_IDS.NAME_ON_CARD} | ||
label={translate('addDebitCardPage.nameOnCard')} | ||
aria-label={translate('addDebitCardPage.nameOnCard')} | ||
role={CONST.ROLE.PRESENTATION} | ||
containerStyles={[styles.mt5]} | ||
spellCheck={false} | ||
/> | ||
<View style={[styles.flexRow, styles.mt5]}> | ||
<View style={[styles.flex1, styles.mr2]}> | ||
<InputWrapper | ||
InputComponent={TextInput} | ||
inputID={INPUT_IDS.EXPIRATION_DATE} | ||
label={translate('addDebitCardPage.expiration')} | ||
aria-label={translate('addDebitCardPage.expiration')} | ||
role={CONST.ROLE.PRESENTATION} | ||
placeholder={translate('addDebitCardPage.expirationDate')} | ||
inputMode={CONST.INPUT_MODE.NUMERIC} | ||
maxLength={4} | ||
/> | ||
</View> | ||
<View style={styles.flex1}> | ||
<InputWrapper | ||
InputComponent={TextInput} | ||
inputID={INPUT_IDS.SECURITY_CODE} | ||
label={translate('addDebitCardPage.cvv')} | ||
aria-label={translate('addDebitCardPage.cvv')} | ||
role={CONST.ROLE.PRESENTATION} | ||
maxLength={4} | ||
inputMode={CONST.INPUT_MODE.NUMERIC} | ||
/> | ||
</View> | ||
</View> | ||
{!!showAddressField && ( | ||
<InputWrapper | ||
InputComponent={AddressSearch} | ||
inputID={INPUT_IDS.ADDRESS_STREET} | ||
label={translate('addDebitCardPage.billingAddress')} | ||
containerStyles={[styles.mt5]} | ||
maxInputLength={CONST.FORM_CHARACTER_LIMIT} | ||
// Limit the address search only to the USA until we fully can support international debit cards | ||
isLimitedToUSA | ||
/> | ||
)} | ||
<InputWrapper | ||
InputComponent={TextInput} | ||
inputID={INPUT_IDS.ADDRESS_ZIP_CODE} | ||
label={translate('common.zip')} | ||
aria-label={translate('common.zip')} | ||
role={CONST.ROLE.PRESENTATION} | ||
inputMode={CONST.INPUT_MODE.NUMERIC} | ||
maxLength={CONST.BANK_ACCOUNT.MAX_LENGTH.ZIP_CODE} | ||
containerStyles={[styles.mt5]} | ||
/> | ||
{!!showStateSelector && ( | ||
<View style={[styles.mt4, styles.mhn5]}> | ||
<InputWrapper | ||
stateSelectorRoute={route.name === SCREENS.IOU_SEND.ADD_DEBIT_CARD ? ROUTES.MONEY_REQUEST_STATE_SELECTOR : undefined} | ||
InputComponent={StateSelector} | ||
inputID={INPUT_IDS.ADDRESS_STATE} | ||
/> | ||
</View> | ||
)} | ||
{!!showCurrencyField && ( | ||
<Hoverable> | ||
{(isHovered) => ( | ||
<TextInput | ||
label={translate('common.currency')} | ||
aria-label={translate('common.currency')} | ||
role={CONST.ROLE.COMBOBOX} | ||
icon={Expensicons.ArrowRight} | ||
onPress={showCurrenciesModal} | ||
value={currency} | ||
containerStyles={[styles.mt5]} | ||
inputStyle={isHovered && styles.cursorPointer} | ||
hideFocusedState | ||
caretHidden | ||
This comment has been minimized.
Sorry, something went wrong. |
||
/> | ||
)} | ||
</Hoverable> | ||
)} | ||
{!!showAcceptTerms && ( | ||
<View style={[styles.mt4, styles.ml1]}> | ||
<InputWrapper | ||
InputComponent={CheckboxWithLabel} | ||
accessibilityLabel={`${translate('common.iAcceptThe')} ${translate('common.expensifyTermsOfService')} ${translate('common.and')} ${translate( | ||
'common.termsOfService', | ||
)}`} | ||
inputID={INPUT_IDS.ACCEPT_TERMS} | ||
defaultValue={false} | ||
LabelComponent={isDebitCard ? IAcceptDebitTheLabel : IAcceptTheLabel} | ||
/> | ||
</View> | ||
)} | ||
|
||
<PaymentCardCurrencyModal | ||
isVisible={isCurrencyModalVisible} | ||
currencies={Object.keys(CONST.CURRENCY) as Array<keyof typeof CONST.CURRENCY>} | ||
currentCurrency={currency} | ||
onCurrencyChange={changeCurrency} | ||
onClose={() => setIsCurrencyModalVisible(false)} | ||
/> | ||
{footerContent} | ||
</FormProvider> | ||
</> | ||
); | ||
} | ||
|
||
PaymentCardForm.displayName = 'PaymentCardForm'; | ||
|
||
export default PaymentCardForm; |
Oops, something went wrong.
There was an edge case related to Keyboard which we handled here