Skip to content

Commit

Permalink
fix: AmonHenV2 connection flow incremental permitted chain approval a…
Browse files Browse the repository at this point in the history
…nd account address case comparison (#27518)

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Previously the AmonHenV2 incremental permitted chain approval view was
not correctly showing the chain being permitted. This PR fixes this
correctly dereferencing the caveat value.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/27518?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. `CHAIN_PERMISSIONS=1 yarn start` 
2. On a dapp that is connected, open the console
3. 
```
await window.ethereum.request({
 "method": "wallet_switchEthereumChain",
 "params": [
  {
    chainId: "0x1" // use a chain that is not already permitted for the dapp
  }
],
});
```
4. Expect to see the network being switched to in the component

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

![Screenshot 2024-09-30 at 3 13
33 PM](https://github.com/user-attachments/assets/cc050a5c-dc1c-4bed-8e35-1799f4ef131d)

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
  • Loading branch information
jiexi authored Oct 2, 2024
1 parent 879b1d9 commit 4fa502b
Showing 1 changed file with 6 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { getSnapsMetadata } from '../../../selectors';
import { getSnapName } from '../../../helpers/utils/util';
import PermissionCell from '../permission-cell';
import { Box } from '../../component-library';
import { CaveatTypes } from '../../../../shared/constants/permissions';

/**
* Get one or more permission descriptions for a permission name.
Expand All @@ -17,6 +18,10 @@ import { Box } from '../../component-library';
* @returns {JSX.Element} A permission description node.
*/
function getDescriptionNode(permission, index, accounts) {
const permissionValue = permission?.permissionValue?.caveats?.find(
(caveat) => caveat.type === CaveatTypes.restrictNetworkSwitching,
)?.value;

return (
<PermissionCell
permissionName={permission.name}
Expand All @@ -26,7 +31,7 @@ function getDescriptionNode(permission, index, accounts) {
avatarIcon={permission.leftIcon}
key={`${permission.permissionName}-${index}`}
accounts={accounts}
permissionValue={permission.permissionValue.restrictNetworkSwitching}
permissionValue={permissionValue}
/>
);
}
Expand Down

0 comments on commit 4fa502b

Please sign in to comment.