m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

show token approval details on confirm approve screen by default (#14523)

Browse Source
This commit is contained in:
Alex Donesky 2022-04-26 10:21:52 -05:00 committed by GitHub
parent 37272ad923
commit cf2c6a3164
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/_locales/en/messages.json
View File

@ -1443,6 +1443,9 @@
"hide": { "hide": {
"message": "Hide" "message": "Hide"
}, },
"hideFullTransactionDetails": {
"message": "Hide full transaction details"
},
"hideSeedPhrase": { "hideSeedPhrase": {
"message": "Hide seed phrase" "message": "Hide seed phrase"
}, },

10
test/e2e/metamask-ui.spec.js
View File

@ -555,11 +555,6 @@ describe('MetaMask', function () {
}); });
it('displays the token approval data', async function () { it('displays the token approval data', async function () {
await driver.clickElement(
'.confirm-approve-content__view-full-tx-button',
);
await driver.delay(regularDelayMs);
const functionType = await driver.findElement( const functionType = await driver.findElement(
'.confirm-approve-content__data .confirm-approve-content__small-text', '.confirm-approve-content__data .confirm-approve-content__small-text',
); );
@ -750,11 +745,6 @@ describe('MetaMask', function () {
}); });
it('shows the correct recipient', async function () { it('shows the correct recipient', async function () {
await driver.clickElement(
'.confirm-approve-content__view-full-tx-button',
);
await driver.delay(regularDelayMs);
const permissionInfo = await driver.findElements( const permissionInfo = await driver.findElements(
'.confirm-approve-content__medium-text', '.confirm-approve-content__medium-text',
); );

10
ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
View File

@ -73,7 +73,7 @@ export default class ConfirmApproveContent extends Component {
}; };
state = { state = {
showFullTxDetails: false, showFullTxDetails: true,
copied: false, copied: false,
}; };
@ -613,7 +613,9 @@ export default class ConfirmApproveContent extends Component {
> >
<div className="confirm-approve-content__view-full-tx-button cursor-pointer"> <div className="confirm-approve-content__view-full-tx-button cursor-pointer">
<div className="confirm-approve-content__small-blue-text"> <div className="confirm-approve-content__small-blue-text">
{t('viewFullTransactionDetails')} {this.state.showFullTxDetails
? t('hideFullTransactionDetails')
: t('viewFullTransactionDetails')}
</div> </div>
<i <i
className={classnames({ className={classnames({
@ -642,7 +644,9 @@ export default class ConfirmApproveContent extends Component {
> >
<div className="confirm-approve-content__view-full-tx-button cursor-pointer"> <div className="confirm-approve-content__view-full-tx-button cursor-pointer">
<div className="confirm-approve-content__small-blue-text"> <div className="confirm-approve-content__small-blue-text">
{t('viewFullTransactionDetails')} {this.state.showFullTxDetails
? t('hideFullTransactionDetails')
: t('viewFullTransactionDetails')}
</div> </div>
<i <i
className={classnames({ className={classnames({

13
ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.test.js
View File

@ -51,7 +51,7 @@ describe('ConfirmApproveContent Component', () => {
), ),
).toBeInTheDocument(); ).toBeInTheDocument();
expect(queryByText('0x9bc5...fef4')).toBeInTheDocument(); expect(queryByText('0x9bc5...fef4')).toBeInTheDocument();
expect(queryByText('View full transaction details')).toBeInTheDocument(); expect(queryByText('Hide full transaction details')).toBeInTheDocument();
expect(queryByText('Edit Permission')).toBeInTheDocument(); expect(queryByText('Edit Permission')).toBeInTheDocument();
const editPermission = getByText('Edit Permission'); const editPermission = getByText('Edit Permission');
@ -73,14 +73,15 @@ describe('ConfirmApproveContent Component', () => {
fireEvent.click(editButtons[1]); fireEvent.click(editButtons[1]);
expect(props.showCustomizeNonceModal).toHaveBeenCalledTimes(1); expect(props.showCustomizeNonceModal).toHaveBeenCalledTimes(1);
const showHideTxDetails = getByText('View full transaction details'); const showHideTxDetails = getByText('Hide full transaction details');
expect(queryByText('Permission request')).not.toBeInTheDocument();
expect(queryByText('Approved amount:')).not.toBeInTheDocument();
expect(queryByText('Granted to:')).not.toBeInTheDocument();
fireEvent.click(showHideTxDetails);
expect(getByText('Permission request')).toBeInTheDocument(); expect(getByText('Permission request')).toBeInTheDocument();
expect(getByText('Approved amount:')).toBeInTheDocument(); expect(getByText('Approved amount:')).toBeInTheDocument();
expect(getByText('Granted to:')).toBeInTheDocument(); expect(getByText('Granted to:')).toBeInTheDocument();
fireEvent.click(showHideTxDetails);
expect(getByText('View full transaction details')).toBeInTheDocument();
expect(queryByText('Permission request')).not.toBeInTheDocument();
expect(queryByText('Approved amount:')).not.toBeInTheDocument();
expect(queryByText('Granted to:')).not.toBeInTheDocument();
expect(getByText('0x9bc5...fef4')).toBeInTheDocument(); expect(getByText('0x9bc5...fef4')).toBeInTheDocument();
}); });
}); });