feat(TokenEnterAmount): add new component to Swap flow #6247
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,7 @@ import { | |
| View, | ||
| } from 'react-native' | ||
| import { getNumberFormatSettings } from 'react-native-localize' | ||
| import SkeletonPlaceholder from 'react-native-skeleton-placeholder' | ||
| import TextInput from 'src/components/TextInput' | ||
| import TokenDisplay from 'src/components/TokenDisplay' | ||
| import TokenIcon, { IconSize } from 'src/components/TokenIcon' | ||
|
|
@@ -105,12 +106,10 @@ export function getDisplayLocalAmount( | |
| * variables and handlers that manage "enter amount" functionality, including rate calculations. | ||
| */ | ||
| export function useEnterAmount(props: { | ||
| token: TokenBalance | undefined | ||
| inputRef: React.RefObject<RNTextInput> | ||
| onHandleAmountInputChange?(amount: string): void | ||
| }) { | ||
| /** | ||
| * This field is formatted for processing purpose. It is a lot easier to process a number formatted | ||
| * in a single format, rather than writing different logic for various combinations of decimal | ||
|
|
@@ -139,6 +138,15 @@ export function useEnterAmount(props: { | |
| * - `local.displayAmount` -> `localDisplayAmount` | ||
| */ | ||
| const processedAmounts = useMemo(() => { | ||
| const { decimalSeparator } = getNumberFormatSettings() | ||
|
|
||
| if (!props.token) { | ||
|
There was a problem hiding this comment. is it okay that this variable is not listed in the dependecies list? There was a problem hiding this comment. @bakoushin accidentally missed it! Will add it to the list. P.S. Sometimes I really wish we had eslint rule for this 😄 |
||
| return { | ||
| token: { bignum: null, displayAmount: '' }, | ||
| local: { bignum: null, displayAmount: '' }, | ||
| } | ||
| } | ||
|
|
||
| if (amountType === 'token') { | ||
| const parsedTokenAmount = amount === '' ? null : parseInputAmount(amount) | ||
|
|
||
|
|
@@ -201,9 +209,11 @@ export function useEnterAmount(props: { | |
| displayAmount: getDisplayLocalAmount(parsedLocalAmount, localCurrencySymbol), | ||
| }, | ||
| } | ||
| }, [amount, amountType, localCurrencySymbol, usdToLocalRate, props.token]) | ||
|
|
||
| function handleToggleAmountType() { | ||
| if (!props.token) return | ||
|
|
||
| const newAmountType = amountType === 'local' ? 'token' : 'local' | ||
| setAmountType(newAmountType) | ||
| setAmount( | ||
|
|
@@ -218,7 +228,7 @@ export function useEnterAmount(props: { | |
| value = unformatNumberForProcessing(value) | ||
| value = value.startsWith('.') ? `0${value}` : value | ||
|
|
||
| if (!value || !props.token) { | ||
| setAmount('') | ||
| props.onHandleAmountInputChange?.('') | ||
| return | ||
|
|
@@ -231,17 +241,30 @@ export function useEnterAmount(props: { | |
| `^(?:\\d+[.]?\\d{0,${props.token.decimals}}|[.]\\d{0,${props.token.decimals}}|[.])$` | ||
| ) | ||
|
|
||
| const isValidTokenAmount = amountType === 'token' && value.match(tokenAmountRegex) | ||
| const isValidLocalAmount = amountType === 'local' && value.match(localAmountRegex) | ||
| if (isValidTokenAmount || isValidLocalAmount) { | ||
| setAmount(value) | ||
| props.onHandleAmountInputChange?.(value) | ||
| return | ||
| } | ||
| } | ||
|
|
||
| function replaceAmount(value: string) { | ||
| if (!props.token) return | ||
|
|
||
| if (value === '') { | ||
| setAmount('') | ||
| return | ||
| } | ||
|
|
||
| const rawValue = unformatNumberForProcessing(value) | ||
| const roundedAmount = new BigNumber(rawValue).decimalPlaces(props.token?.decimals).toString() | ||
| setAmount(roundedAmount) | ||
| } | ||
|
|
||
| function handleSelectPercentageAmount(percentage: number) { | ||
| if (!props.token) return | ||
| if (percentage <= 0 || percentage > 1) return | ||
|
|
||
| const percentageAmount = props.token.balance.multipliedBy(percentage) | ||
|
|
@@ -265,7 +288,7 @@ export function useEnterAmount(props: { | |
| amount, | ||
| amountType, | ||
| processedAmounts, | ||
| replaceAmount, | ||
| handleToggleAmountType, | ||
| handleAmountInputChange, | ||
| handleSelectPercentageAmount, | ||
|
|
@@ -281,30 +304,31 @@ export default function TokenEnterAmount({ | |
| inputRef, | ||
| inputStyle, | ||
| autoFocus, | ||
| testID, | ||
| onInputChange, | ||
| toggleAmountType, | ||
| onOpenTokenPicker, | ||
| loading, | ||
| }: { | ||
| token?: TokenBalance | ||
| inputValue: string | ||
| tokenAmount: string | ||
| localAmount: string | ||
| amountType: AmountEnteredIn | ||
| inputRef: React.MutableRefObject<RNTextInput | null> | ||
| loading?: boolean | ||
| inputStyle?: StyleProp<TextStyle> | ||
| autoFocus?: boolean | ||
| testID?: string | ||
| onInputChange?(value: string): void | ||
| toggleAmountType?(): void | ||
| onOpenTokenPicker?(): void | ||
| }) { | ||
| const { t } = useTranslation() | ||
| /** | ||
| * startPosition and inputRef variables exist to ensure TextInput displays the start of the value | ||
| * for long values on Android: https://github.com/facebook/react-native/issues/14845 | ||
| */ | ||
| const [startPosition, setStartPosition] = useState<number | undefined>(0) | ||
| // this should never be null, just adding a default to make TS happy | ||
| const localCurrencySymbol = useSelector(getLocalCurrencySymbol) ?? LocalCurrencySymbol.USD | ||
|
|
@@ -359,7 +383,10 @@ export default function TokenEnterAmount({ | |
|
|
||
| <View style={styles.tokenNameAndAvailable}> | ||
| <Text style={styles.tokenName} testID={`${testID}/TokenName`}> | ||
| {t('tokenEnterAmount.tokenDescription', { | ||
| tokenName: token.symbol, | ||
| tokenNetwork: NETWORK_NAMES[token.networkId], | ||
| })} | ||
| </Text> | ||
| <Text style={styles.tokenBalance} testID={`${testID}/TokenBalance`}> | ||
| <Trans i18nKey="tokenEnterAmount.availableBalance"> | ||
|
|
@@ -381,81 +408,95 @@ export default function TokenEnterAmount({ | |
| </View> | ||
| </Touchable> | ||
| {token && ( | ||
| <View> | ||
|
There was a problem hiding this comment. This addition/removal is purely a result of adding extra |
||
| <View | ||
| style={[ | ||
| styles.rowContainer, | ||
| { borderTopLeftRadius: 0, borderTopRightRadius: 0, borderTopWidth: 0 }, | ||
| ]} | ||
| > | ||
| <TextInput | ||
| forwardedRef={inputRef} | ||
| onChangeText={(value) => { | ||
| handleSetStartPosition(undefined) | ||
| onInputChange?.(value) | ||
| }} | ||
| value={formattedInputValue} | ||
| placeholderTextColor={Colors.gray3} | ||
| placeholder={amountType === 'token' ? placeholder.token : placeholder.local} | ||
| keyboardType="decimal-pad" | ||
| // Work around for RN issue with Samsung keyboards | ||
| // https://github.com/facebook/react-native/issues/22005 | ||
| autoCapitalize="words" | ||
| autoFocus={autoFocus} | ||
| // unset lineHeight to allow ellipsis on long inputs on iOS. For | ||
| // android, ellipses doesn't work and unsetting line height causes | ||
| // height changes when amount is entered | ||
| inputStyle={[ | ||
| styles.primaryAmountText, | ||
| inputStyle, | ||
| Platform.select({ ios: { lineHeight: undefined } }), | ||
| ]} | ||
| onBlur={() => { | ||
| handleSetStartPosition(0) | ||
| }} | ||
| onFocus={() => { | ||
| const withCurrency = amountType === 'local' ? 1 : 0 | ||
| handleSetStartPosition((inputValue?.length ?? 0) + withCurrency) | ||
| }} | ||
| onSelectionChange={() => { | ||
| handleSetStartPosition(undefined) | ||
| }} | ||
| selection={ | ||
| Platform.OS === 'android' && typeof startPosition === 'number' | ||
| ? { start: startPosition } | ||
| : undefined | ||
| } | ||
| showClearButton={false} | ||
| editable={!!onInputChange} | ||
| testID={`${testID}/TokenAmountInput`} | ||
| /> | ||
|
|
||
| {token.priceUsd ? ( | ||
| <> | ||
| {toggleAmountType && ( | ||
| <Touchable | ||
| onPress={toggleAmountType} | ||
| style={styles.swapArrowContainer} | ||
| testID={`${testID}/SwitchTokens`} | ||
| hitSlop={variables.iconHitslop} | ||
| > | ||
| <SwapArrows color={Colors.gray3} size={24} /> | ||
| </Touchable> | ||
| )} | ||
|
|
||
| <Text | ||
| numberOfLines={1} | ||
| style={[styles.secondaryAmountText, { flex: 0, textAlign: 'right' }]} | ||
| testID={`${testID}/ExchangeAmount`} | ||
| > | ||
| {amountType === 'token' | ||
| ? `${APPROX_SYMBOL} ${localAmount ? localAmount : placeholder.local}` | ||
| : `${APPROX_SYMBOL} ${tokenAmount ? tokenAmount : placeholder.token}`} | ||
| </Text> | ||
| </> | ||
| ) : ( | ||
| <Text style={styles.secondaryAmountText}> | ||
| {t('tokenEnterAmount.fiatPriceUnavailable')} | ||
| </Text> | ||
| )} | ||
| </View> | ||
|
|
||
| {loading && ( | ||
| <View testID={`${testID}/Loader`} style={styles.loader}> | ||
| <SkeletonPlaceholder | ||
| borderRadius={100} // ensure rounded corners with font scaling | ||
| backgroundColor={Colors.gray2} | ||
| highlightColor={Colors.white} | ||
| > | ||
| <View style={{ height: '100%', width: '100%' }} /> | ||
| </SkeletonPlaceholder> | ||
| </View> | ||
| )} | ||
| </View> | ||
| )} | ||
|
|
@@ -511,4 +552,12 @@ const styles = StyleSheet.create({ | |
| swapArrowContainer: { | ||
| transform: [{ rotate: '90deg' }], | ||
| }, | ||
| loader: { | ||
| padding: Spacing.Regular16, | ||
| position: 'absolute', | ||
| top: 0, | ||
| left: 0, | ||
| height: '100%', | ||
| width: '100%', | ||
| }, | ||
| }) | ||
Oops, something went wrong.
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.
i guess the translation of the word "on" is highly dependent on context. perhaps we can use some template to provide it? kind of like this:
and, with that, shall we include this item in the
tokenEnterAmountgroup above?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.
do we need to keep the "on"?