-
Notifications
You must be signed in to change notification settings - Fork 100
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(send): add new enter amount screen (#4370)
### Description Adds new enter amount screen for multichain sends. Also - refactors assets screen and selectors to re-use getting tokens with balances and zero balance tokens. - adds a new state to send to track last sent tokenId, which will be the default token on the enter amount screen - removes lastUsedCurrency and associated actions and reducers which was not used anywhere ### Test plan Unit tests, manual https://github.com/valora-inc/wallet/assets/5062591/bcb10854-7938-440b-a16a-d7302abd378b ### Related issues - Fixes ACT-941 ### Backwards compatibility Yes --------- Co-authored-by: Tom McGuire <[email protected]>
- Loading branch information
1 parent
a1f9c33
commit c2d3642
Showing
21 changed files
with
743 additions
and
64 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
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,238 @@ | ||
| import { fireEvent, render, waitFor } from '@testing-library/react-native' | ||
| import BigNumber from 'bignumber.js' | ||
| import React from 'react' | ||
| import { Provider } from 'react-redux' | ||
| import { SendEvents } from 'src/analytics/Events' | ||
| import ValoraAnalytics from 'src/analytics/ValoraAnalytics' | ||
| import { SendOrigin } from 'src/analytics/types' | ||
| import { useMaxSendAmount } from 'src/fees/hooks' | ||
| import { RecipientType } from 'src/recipients/recipient' | ||
| import SendEnterAmount from 'src/send/SendEnterAmount' | ||
| import { getSupportedNetworkIdsForSend } from 'src/tokens/utils' | ||
| import { NetworkId } from 'src/transactions/types' | ||
| import MockedNavigator from 'test/MockedNavigator' | ||
| import { createMockStore } from 'test/utils' | ||
| import { | ||
| mockCeloTokenId, | ||
| mockEthTokenId, | ||
| mockPoofAddress, | ||
| mockPoofTokenId, | ||
| mockTokenBalances, | ||
| } from 'test/values' | ||
|
|
||
| jest.mock('src/tokens/utils', () => ({ | ||
| ...jest.requireActual('src/tokens/utils'), | ||
| getSupportedNetworkIdsForSend: jest.fn(), | ||
| })) | ||
|
|
||
| jest.mock('src/fees/hooks') | ||
|
|
||
| const mockStore = { | ||
| tokens: { | ||
| tokenBalances: { | ||
| ...mockTokenBalances, | ||
| [mockEthTokenId]: { | ||
| tokenId: mockEthTokenId, | ||
| balance: '0', | ||
| priceUsd: '5', | ||
| networkId: NetworkId['ethereum-sepolia'], | ||
| showZeroBalance: true, | ||
| isNative: true, | ||
| symbol: 'ETH', | ||
| priceFetchedAt: Date.now(), | ||
| name: 'Ether', | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| const params = { | ||
| origin: SendOrigin.AppSendFlow, | ||
| recipient: { | ||
| recipientType: RecipientType.Address, | ||
| address: '0x123', | ||
| }, | ||
| isFromScan: false, | ||
| } | ||
|
|
||
| describe('SendEnterAmount', () => { | ||
| beforeEach(() => { | ||
| jest | ||
| .mocked(getSupportedNetworkIdsForSend) | ||
| .mockReturnValue([NetworkId['celo-alfajores'], NetworkId['ethereum-sepolia']]) | ||
| jest.clearAllMocks() | ||
| }) | ||
|
|
||
| it('renders components with picker using token with highest balance if no override or last used token exists', () => { | ||
| const store = createMockStore(mockStore) | ||
|
|
||
| const { getByTestId, getByText } = render( | ||
| <Provider store={store}> | ||
| <MockedNavigator component={SendEnterAmount} params={params} /> | ||
| </Provider> | ||
| ) | ||
|
|
||
| expect(getByTestId('SendEnterAmount/Input')).toBeTruthy() | ||
| expect(getByTestId('SendEnterAmount/LocalAmount')).toBeTruthy() | ||
| expect(getByTestId('SendEnterAmount/LocalAmount')).toHaveTextContent('₱0.00') | ||
| expect(getByTestId('SendEnterAmount/Max')).toBeTruthy() | ||
| expect(getByTestId('SendEnterAmount/TokenSelect')).toBeTruthy() | ||
| expect(getByTestId('SendEnterAmount/TokenSelect')).toHaveTextContent('POOF') | ||
| expect( | ||
| getByText('sendEnterAmountScreen.networkFee, {"networkName":"Celo Alfajores"}') | ||
| ).toBeTruthy() | ||
| }) | ||
|
|
||
| it('renders components with picker using last used token', () => { | ||
| const store = createMockStore({ ...mockStore, send: { lastUsedTokenId: mockEthTokenId } }) | ||
|
|
||
| const { getByTestId, getByText } = render( | ||
| <Provider store={store}> | ||
| <MockedNavigator component={SendEnterAmount} params={params} /> | ||
| </Provider> | ||
| ) | ||
|
|
||
| expect(getByTestId('SendEnterAmount/Input')).toBeTruthy() | ||
| expect(getByTestId('SendEnterAmount/LocalAmount')).toBeTruthy() | ||
| expect(getByTestId('SendEnterAmount/LocalAmount')).toHaveTextContent('₱0.00') | ||
| expect(getByTestId('SendEnterAmount/Max')).toBeTruthy() | ||
| expect(getByTestId('SendEnterAmount/TokenSelect')).toBeTruthy() | ||
| expect(getByTestId('SendEnterAmount/TokenSelect')).toHaveTextContent('ETH') | ||
| expect( | ||
| getByText('sendEnterAmountScreen.networkFee, {"networkName":"Ethereum Sepolia"}') | ||
| ).toBeTruthy() | ||
| }) | ||
|
|
||
| it('renders components with picker using token override', () => { | ||
| const store = createMockStore({ ...mockStore, send: { lastUsedTokenId: mockEthTokenId } }) | ||
|
|
||
| const { getByTestId, getByText } = render( | ||
| <Provider store={store}> | ||
| <MockedNavigator | ||
| component={SendEnterAmount} | ||
| params={{ ...params, defaultTokenIdOverride: mockCeloTokenId }} | ||
| /> | ||
| </Provider> | ||
| ) | ||
|
|
||
| expect(getByTestId('SendEnterAmount/Input')).toBeTruthy() | ||
| expect(getByTestId('SendEnterAmount/LocalAmount')).toBeTruthy() | ||
| expect(getByTestId('SendEnterAmount/LocalAmount')).toHaveTextContent('₱0.00') | ||
| expect(getByTestId('SendEnterAmount/Max')).toBeTruthy() | ||
| expect(getByTestId('SendEnterAmount/TokenSelect')).toBeTruthy() | ||
| expect(getByTestId('SendEnterAmount/TokenSelect')).toHaveTextContent('CELO') | ||
| expect( | ||
| getByText('sendEnterAmountScreen.networkFee, {"networkName":"Celo Alfajores"}') | ||
| ).toBeTruthy() | ||
| }) | ||
|
|
||
| it('renders components with picker using token with highest balance if default override is not supported for sends', () => { | ||
| jest.mocked(getSupportedNetworkIdsForSend).mockReturnValue([NetworkId['celo-alfajores']]) | ||
| const store = createMockStore(mockStore) | ||
|
|
||
| const { getByTestId, getByText } = render( | ||
| <Provider store={store}> | ||
| <MockedNavigator | ||
| component={SendEnterAmount} | ||
| params={{ ...params, defaultTokenIdOverride: mockEthTokenId }} | ||
| /> | ||
| </Provider> | ||
| ) | ||
|
|
||
| expect(getByTestId('SendEnterAmount/Input')).toBeTruthy() | ||
| expect(getByTestId('SendEnterAmount/LocalAmount')).toBeTruthy() | ||
| expect(getByTestId('SendEnterAmount/LocalAmount')).toHaveTextContent('₱0.00') | ||
| expect(getByTestId('SendEnterAmount/Max')).toBeTruthy() | ||
| expect(getByTestId('SendEnterAmount/TokenSelect')).toBeTruthy() | ||
| expect(getByTestId('SendEnterAmount/TokenSelect')).toHaveTextContent('POOF') | ||
| expect( | ||
| getByText('sendEnterAmountScreen.networkFee, {"networkName":"Celo Alfajores"}') | ||
| ).toBeTruthy() | ||
| }) | ||
|
|
||
| it('entering amount updates local amount', () => { | ||
| const store = createMockStore(mockStore) | ||
|
|
||
| const { getByTestId } = render( | ||
| <Provider store={store}> | ||
| <MockedNavigator component={SendEnterAmount} params={params} /> | ||
| </Provider> | ||
| ) | ||
|
|
||
| fireEvent.changeText(getByTestId('SendEnterAmount/Input'), '10') | ||
| expect(getByTestId('SendEnterAmount/LocalAmount')).toHaveTextContent('₱1.33') | ||
| }) | ||
|
|
||
| it('only allows numeric input', () => { | ||
| const store = createMockStore(mockStore) | ||
|
|
||
| const { getByTestId } = render( | ||
| <Provider store={store}> | ||
| <MockedNavigator component={SendEnterAmount} params={params} /> | ||
| </Provider> | ||
| ) | ||
|
|
||
| fireEvent.changeText(getByTestId('SendEnterAmount/Input'), '10.5') | ||
| expect(getByTestId('SendEnterAmount/Input').props.value).toBe('10.5') | ||
| fireEvent.changeText(getByTestId('SendEnterAmount/Input'), '10.5.1') | ||
| expect(getByTestId('SendEnterAmount/Input').props.value).toBe('10.5') | ||
| fireEvent.changeText(getByTestId('SendEnterAmount/Input'), 'abc') | ||
| expect(getByTestId('SendEnterAmount/Input').props.value).toBe('10.5') | ||
| }) | ||
|
|
||
| it('selecting new token updates token and network info', async () => { | ||
| const store = createMockStore(mockStore) | ||
|
|
||
| const { getByTestId, getByText } = render( | ||
| <Provider store={store}> | ||
| <MockedNavigator component={SendEnterAmount} params={params} /> | ||
| </Provider> | ||
| ) | ||
|
|
||
| expect(getByTestId('SendEnterAmount/TokenSelect')).toHaveTextContent('POOF') | ||
| expect( | ||
| getByText('sendEnterAmountScreen.networkFee, {"networkName":"Celo Alfajores"}') | ||
| ).toBeTruthy() | ||
| fireEvent.press(getByTestId('SendEnterAmount/TokenSelect')) | ||
| await waitFor(() => expect(getByText('Ether')).toBeTruthy()) | ||
| fireEvent.press(getByText('Ether')) | ||
| expect(getByTestId('SendEnterAmount/TokenSelect')).toHaveTextContent('ETH') | ||
| expect( | ||
| getByText('sendEnterAmountScreen.networkFee, {"networkName":"Ethereum Sepolia"}') | ||
| ).toBeTruthy() | ||
| expect(ValoraAnalytics.track).toHaveBeenCalledTimes(2) | ||
| expect(ValoraAnalytics.track).toHaveBeenCalledWith(SendEvents.token_dropdown_opened, { | ||
| currentNetworkId: NetworkId['celo-alfajores'], | ||
| currentTokenAddress: mockPoofAddress, | ||
| currentTokenId: mockPoofTokenId, | ||
| }) | ||
| expect(ValoraAnalytics.track).toHaveBeenCalledWith(SendEvents.token_selected, { | ||
| networkId: NetworkId['ethereum-sepolia'], | ||
| tokenAddress: undefined, | ||
| tokenId: mockEthTokenId, | ||
| origin: 'Send', | ||
| }) | ||
| // TODO(ACT-958): assert fees | ||
| }) | ||
|
|
||
| it('pressing max fills in max available amount', () => { | ||
| jest.mocked(useMaxSendAmount).mockReturnValue(new BigNumber(5)) | ||
| const store = createMockStore(mockStore) | ||
|
|
||
| const { getByTestId } = render( | ||
| <Provider store={store}> | ||
| <MockedNavigator component={SendEnterAmount} params={params} /> | ||
| </Provider> | ||
| ) | ||
|
|
||
| fireEvent.press(getByTestId('SendEnterAmount/Max')) | ||
| expect(getByTestId('SendEnterAmount/Input').props.value).toBe('5') | ||
| expect(getByTestId('SendEnterAmount/LocalAmount')).toHaveTextContent('₱0.67') | ||
| expect(ValoraAnalytics.track).toHaveBeenCalledTimes(1) | ||
| expect(ValoraAnalytics.track).toHaveBeenCalledWith(SendEvents.max_pressed, { | ||
| networkId: NetworkId['celo-alfajores'], | ||
| tokenAddress: mockPoofAddress, | ||
| tokenId: mockPoofTokenId, | ||
| }) | ||
| }) | ||
| }) |
Oops, something went wrong.