Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed hardware wallet info popup on token allowance screen #17881

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ui/pages/token-allowance/token-allowance.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import {
getUnapprovedTxCount,
getUnapprovedTransactions,
getUseCurrencyRateCheck,
isHardwareWallet,
} from '../../selectors';
import { NETWORK_TO_NAME_MAP } from '../../../shared/constants/network';
import {
Expand Down Expand Up @@ -62,6 +63,7 @@ import { ConfirmPageContainerNavigation } from '../../components/app/confirm-pag
import { useSimulationFailureWarning } from '../../hooks/useSimulationFailureWarning';
import SimulationErrorMessage from '../../components/ui/simulation-error-message';
import { Icon, ICON_NAMES } from '../../components/component-library';
import LedgerInstructionField from '../../components/app/ledger-instruction-field/ledger-instruction-field';

export default function TokenAllowance({
origin,
Expand Down Expand Up @@ -111,6 +113,7 @@ export default function TokenAllowance({
const unapprovedTxCount = useSelector(getUnapprovedTxCount);
const unapprovedTxs = useSelector(getUnapprovedTransactions);
const useCurrencyRateCheck = useSelector(getUseCurrencyRateCheck);
const isHardwareWalletConnected = useSelector(isHardwareWallet);

const replaceCommaToDot = (inputValue) => {
return inputValue.replace(/,/gu, '.');
Expand Down Expand Up @@ -491,6 +494,11 @@ export default function TokenAllowance({
</Box>
</Box>
) : null}
{!isFirstPage && isHardwareWalletConnected && (
<Box paddingLeft={2} paddingRight={2}>
<LedgerInstructionField showDataInstruction />
</Box>
)}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey will be nice to have test coverage for above.

Copy link
Contributor

@brad-decker brad-decker Feb 28, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seconded. Thirded.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added here: ce80c0e

<PageContainerFooter
cancelText={t('reject')}
submitText={isFirstPage ? t('next') : t('approveButtonText')}
Expand Down
46 changes: 40 additions & 6 deletions ui/pages/token-allowance/token-allowance.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from 'react';
import configureMockStore from 'redux-mock-store';
import { fireEvent } from '@testing-library/react';
import { renderWithProvider } from '../../../test/lib/render-helpers';
import { HardwareKeyringTypes } from '../../../shared/constants/hardware-wallets';
import TokenAllowance from './token-allowance';

const testTokenAddress = '0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F';
Expand All @@ -11,17 +12,17 @@ const state = {
},
metamask: {
accounts: {
'0xAddress': {
address: '0xAddress',
balance: '0x1F4',
'0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': {
address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
balance: '0x0',
},
},
gasEstimateType: 'none',
selectedAddress: '0xAddress',
selectedAddress: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
identities: {
'0xAddress': {
'0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc': {
address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
name: 'Account 1',
address: '0xAddress',
},
},
frequentRpcListDetail: [],
Expand Down Expand Up @@ -65,6 +66,13 @@ const state = {
},
],
unapprovedTxs: {},
keyringTypes: [HardwareKeyringTypes.ledger],
keyrings: [
{
type: HardwareKeyringTypes.ledger,
accounts: ['0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc'],
},
],
},
history: {
mostRecentOverviewPage: '/',
Expand Down Expand Up @@ -245,4 +253,30 @@ describe('TokenAllowancePage', () => {
fireEvent.click(gotIt);
expect(gotIt).not.toBeInTheDocument();
});

it('should show hardware wallet info text', () => {
const { queryByText, getByText, getByTestId } = renderWithProvider(
<TokenAllowance {...props} />,
store,
);

const textField = getByTestId('custom-spending-cap-input');
fireEvent.change(textField, { target: { value: '1' } });

expect(queryByText('Prior to clicking confirm:')).toBeNull();

const nextButton = getByText('Next');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice! tests look good. could be handy to add an additional null check to check the text is not showing on the first page

Suggested change
const nextButton = getByText('Next');
expect(queryByText('Prior to clicking confirm:')).toBeNull();
const nextButton = getByText('Next');

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good suggestion! Thanks!
Changed it here: 455663d

fireEvent.click(nextButton);

expect(queryByText('Prior to clicking confirm:')).toBeInTheDocument();
});

it('should not show hardware wallet info text', () => {
const { queryByText } = renderWithProvider(
<TokenAllowance {...props} />,
store,
);

expect(queryByText('Prior to clicking confirm:')).toBeNull();
});
});