-
Notifications
You must be signed in to change notification settings - Fork 86
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: add claim shortcuts screen (#3951)
### Description As the title - add plumbing to navigate to a new claimable shortcuts screen - UI for displaying claimable shortcuts - the screen will only be navigatable when there are claimable shortcuts, so the screen does not cater for an empty or error state Not included in this PR - claiming reward - analytics ### Test plan  ### Related issues - Fixes RET-733 ### Backwards compatibility Y
- Loading branch information
1 parent
721d464
commit 18bbecc
Showing
10 changed files
with
277 additions
and
14 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| import { render, within } from '@testing-library/react-native' | ||
| import React from 'react' | ||
| import { Provider } from 'react-redux' | ||
| import DappShortcutsRewards from 'src/dapps/DappShortcutsRewards' | ||
| import { createMockStore } from 'test/utils' | ||
| import { mockCusdAddress, mockPositions, mockShortcuts } from 'test/values' | ||
|
|
||
| jest.mock('src/statsig', () => ({ | ||
| getFeatureGate: jest.fn(() => true), | ||
| })) | ||
|
|
||
| const mockCeloAddress = '0x471ece3750da237f93b8e339c536989b8978a438' | ||
| const mockUbeAddress = '0x00be915b9dcf56a3cbe739d9b9c202ca692409ec' | ||
|
|
||
| describe('DappShortcutsRewards', () => { | ||
| beforeEach(() => { | ||
| jest.clearAllMocks() | ||
| }) | ||
|
|
||
| it('should render claimable rewards correctly', () => { | ||
| const { getByText, getAllByTestId } = render( | ||
| <Provider | ||
| store={createMockStore({ | ||
| positions: { | ||
| positions: mockPositions, | ||
| shortcuts: mockShortcuts, | ||
| }, | ||
| tokens: { | ||
| tokenBalances: { | ||
| [mockCeloAddress]: { | ||
| address: mockCeloAddress, | ||
| symbol: 'CELO', | ||
| usdPrice: '0.6959536890241361', // matches data in mockPositions | ||
| balance: '10', | ||
| priceFetchedAt: Date.now(), | ||
| isCoreToken: true, | ||
| }, | ||
| [mockUbeAddress]: { | ||
| address: mockUbeAddress, | ||
| symbol: 'UBE', | ||
| usdPrice: '0.00904673476946796903', // matches data in mockPositions | ||
| balance: '10', | ||
| priceFetchedAt: Date.now(), | ||
| }, | ||
| [mockCusdAddress]: { | ||
| address: mockCusdAddress, | ||
| symbol: 'cUSD', | ||
| usdPrice: '1', | ||
| balance: '10', | ||
| priceFetchedAt: Date.now(), | ||
| isCoreToken: true, | ||
| }, | ||
| }, | ||
| }, | ||
| })} | ||
| > | ||
| <DappShortcutsRewards /> | ||
| </Provider> | ||
| ) | ||
|
|
||
| expect(getByText('dappShortcuts.claimRewardsScreen.title')).toBeTruthy() | ||
| expect(getByText('dappShortcuts.claimRewardsScreen.description')).toBeTruthy() | ||
| expect(getAllByTestId('DappShortcutsRewards/Card').length).toBe(1) | ||
|
|
||
| const rewardCard = getAllByTestId('DappShortcutsRewards/Card')[0] | ||
| expect(within(rewardCard).getByTestId('DappShortcutsRewards/RewardAmount')).toHaveTextContent( | ||
| '0.098 UBE, 0.95 CELO' | ||
| ) | ||
| expect( | ||
| within(rewardCard).getByTestId('DappShortcutsRewards/RewardAmountFiat') | ||
| ).toHaveTextContent('₱0.88') // USD value $0.66, mocked exchange rate 1.33 | ||
| expect(within(rewardCard).getByTestId('DappShortcutsRewards/ClaimButton')).toBeTruthy() | ||
| }) | ||
| }) |
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,171 @@ | ||
| import { BigNumber } from 'bignumber.js' | ||
| import React from 'react' | ||
| import { useTranslation } from 'react-i18next' | ||
| import { Image, StyleSheet, Text, View } from 'react-native' | ||
| import Animated from 'react-native-reanimated' | ||
| import { useSafeAreaInsets } from 'react-native-safe-area-context' | ||
| import { useSelector } from 'react-redux' | ||
| import Button, { BtnSizes } from 'src/components/Button' | ||
| import TokenDisplay from 'src/components/TokenDisplay' | ||
| import { positionsWithClaimableRewardsSelector } from 'src/positions/selectors' | ||
| import { ClaimablePosition } from 'src/positions/types' | ||
| import Colors from 'src/styles/colors' | ||
| import fontStyles from 'src/styles/fonts' | ||
| import { Spacing } from 'src/styles/styles' | ||
| import { Currency } from 'src/utils/currencies' | ||
|
|
||
| function DappShortcutsRewards() { | ||
| const { t } = useTranslation() | ||
| const insets = useSafeAreaInsets() | ||
|
|
||
| const positionsWithClaimableRewards = useSelector(positionsWithClaimableRewardsSelector) | ||
|
|
||
| const handleClaimReward = (position: ClaimablePosition) => () => { | ||
| // do something | ||
| } | ||
|
|
||
| const renderItem = ({ item }: { item: ClaimablePosition }) => { | ||
| let claimableValueUsd = new BigNumber(0) | ||
| item.claimableShortcut.claimableTokens.forEach((token) => { | ||
| claimableValueUsd = claimableValueUsd.plus( | ||
| BigNumber(token.priceUsd).times(BigNumber(token.balance)) | ||
| ) | ||
| }) | ||
|
|
||
| return ( | ||
| <View style={styles.card} testID="DappShortcutsRewards/Card"> | ||
| <View style={styles.rewardInfoContainer}> | ||
| <View style={styles.rewardAmountContainer}> | ||
| <Text style={styles.rewardLabel}> | ||
| {t('dappShortcuts.claimRewardsScreen.rewardLabel')} | ||
| </Text> | ||
|
|
||
| <Text style={styles.rewardAmount} testID="DappShortcutsRewards/RewardAmount"> | ||
| {item.claimableShortcut.claimableTokens.map((token, index) => ( | ||
| <React.Fragment key={token.address}> | ||
| {index > 0 && ', '} | ||
| <TokenDisplay | ||
| amount={token.balance} | ||
| tokenAddress={token.address} | ||
| showLocalAmount={false} | ||
| /> | ||
| </React.Fragment> | ||
| ))} | ||
| </Text> | ||
| {claimableValueUsd && ( | ||
| <TokenDisplay | ||
| style={styles.rewardFiatAmount} | ||
| amount={claimableValueUsd} | ||
| currency={Currency.Dollar} | ||
| showLocalAmount={true} | ||
| testID="DappShortcutsRewards/RewardAmountFiat" | ||
| /> | ||
| )} | ||
| </View> | ||
| <Button | ||
| onPress={handleClaimReward(item)} | ||
| text={t('dappShortcuts.claimRewardsScreen.claimButton')} | ||
| size={BtnSizes.SMALL} | ||
| touchableStyle={styles.claimButton} | ||
| testID="DappShortcutsRewards/ClaimButton" | ||
| /> | ||
| </View> | ||
| <View style={styles.dappInfoContainer}> | ||
| <Image source={{ uri: item.displayProps.imageUrl }} style={styles.dappLogo} /> | ||
| <Text style={styles.dappName}>{item.appName}</Text> | ||
| </View> | ||
| </View> | ||
| ) | ||
| } | ||
|
|
||
| const renderHeader = () => { | ||
| return ( | ||
| <View style={styles.headerContainer}> | ||
| <Text style={styles.heading}>{t('dappShortcuts.claimRewardsScreen.title')}</Text> | ||
| <Text style={styles.subHeading}>{t('dappShortcuts.claimRewardsScreen.description')}</Text> | ||
| </View> | ||
| ) | ||
| } | ||
|
|
||
| return ( | ||
| <> | ||
| <Animated.FlatList | ||
| contentContainerStyle={{ | ||
| paddingHorizontal: Spacing.Thick24, | ||
| paddingBottom: insets.bottom, | ||
| }} | ||
| scrollEventThrottle={16} | ||
| renderItem={renderItem} | ||
| data={positionsWithClaimableRewards} | ||
| ListHeaderComponent={renderHeader} | ||
| /> | ||
| </> | ||
| ) | ||
| } | ||
|
|
||
| const styles = StyleSheet.create({ | ||
| card: { | ||
| borderWidth: 1, | ||
| borderColor: Colors.gray2, | ||
| borderRadius: 12, | ||
| }, | ||
| rewardInfoContainer: { | ||
| flexDirection: 'row', | ||
| alignItems: 'center', | ||
| paddingHorizontal: Spacing.Regular16, | ||
| paddingVertical: Spacing.Small12, | ||
| }, | ||
| rewardAmountContainer: { | ||
| flex: 1, | ||
| marginRight: Spacing.Small12, | ||
| }, | ||
| rewardLabel: { | ||
| ...fontStyles.xsmall, | ||
| color: Colors.gray3, | ||
| }, | ||
| rewardAmount: { | ||
| ...fontStyles.large600, | ||
| lineHeight: 28, | ||
| flexWrap: 'wrap', | ||
| }, | ||
| rewardFiatAmount: { | ||
| ...fontStyles.small, | ||
| }, | ||
| dappInfoContainer: { | ||
| flexDirection: 'row', | ||
| paddingHorizontal: Spacing.Regular16, | ||
| paddingVertical: Spacing.Small12, | ||
| backgroundColor: Colors.gray1, | ||
| borderBottomLeftRadius: 12, | ||
| borderBottomRightRadius: 12, | ||
| }, | ||
| dappLogo: { | ||
| width: 18, | ||
| height: 18, | ||
| marginRight: Spacing.Smallest8, | ||
| backgroundColor: Colors.light, | ||
| borderRadius: 100, | ||
| }, | ||
| dappName: { | ||
| ...fontStyles.small600, | ||
| }, | ||
| headerContainer: { | ||
| paddingTop: Spacing.Smallest8, | ||
| paddingBottom: Spacing.Thick24, | ||
| }, | ||
| heading: { | ||
| ...fontStyles.large600, | ||
| fontSize: 24, | ||
| lineHeight: 32, | ||
| marginBottom: Spacing.Tiny4, | ||
| }, | ||
| subHeading: { | ||
| ...fontStyles.small, | ||
| color: Colors.gray3, | ||
| }, | ||
| claimButton: { | ||
| minWidth: 72, | ||
| }, | ||
| }) | ||
|
|
||
| export default DappShortcutsRewards |
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