Skip to content

Commit

Permalink
chore: Cherry pick bf126d0 (#12716)
Browse files Browse the repository at this point in the history
<!--
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**

Cherry pick bf126d0

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

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

### **Before**

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

### **After**

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

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.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-mobile/blob/main/.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.

Co-authored-by: cryptodev-2s <[email protected]>
  • Loading branch information
sethkfman and cryptodev-2s authored Dec 16, 2024
1 parent 680d587 commit d5c6b7b
Show file tree
Hide file tree
Showing 3 changed files with 155 additions and 120 deletions.
7 changes: 5 additions & 2 deletions app/lib/ppom/ppom-util.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ describe('PPOM Utils', () => {
url: 'https://mainnet.infura.io/v3',
},
],
lastUpdatedAt: Date.now(),
},
},
networksMetadata: {},
Expand All @@ -176,8 +177,10 @@ describe('PPOM Utils', () => {
MockEngine.context.PreferencesController.state.securityAlertsEnabled =
false;
await PPOMUtil.validateRequest(mockRequest, CHAIN_ID_MOCK);
expect(MockEngine.context.PPOMController?.usePPOM).toBeCalledTimes(0);
expect(spyTransactionAction).toBeCalledTimes(0);
expect(MockEngine.context.PPOMController?.usePPOM).toHaveBeenCalledTimes(
0,
);
expect(spyTransactionAction).toHaveBeenCalledTimes(0);
});

it('should not validate if request is send to users own account ', async () => {
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -156,21 +156,21 @@
"@metamask/ethjs-contract": "^0.4.1",
"@metamask/ethjs-query": "^0.7.1",
"@metamask/ethjs-unit": "^0.3.0",
"@metamask/gas-fee-controller": "^21.0.0",
"@metamask/gas-fee-controller": "^22.0.2",
"@metamask/json-rpc-middleware-stream": "^8.0.2",
"@metamask/key-tree": "^9.0.0",
"@metamask/keyring-api": "^8.1.0",
"@metamask/keyring-controller": "^18.0.0",
"@metamask/logging-controller": "^6.0.1",
"@metamask/message-signing-snap": "^0.3.3",
"@metamask/network-controller": "^21.0.0",
"@metamask/notification-services-controller": "^0.11.0",
"@metamask/network-controller": "^22.1.0",
"@metamask/notification-services-controller": "^0.14.0",
"@metamask/permission-controller": "^11.0.0",
"@metamask/phishing-controller": "^12.0.3",
"@metamask/post-message-stream": "^8.0.0",
"@metamask/ppom-validator": "0.35.1",
"@metamask/preferences-controller": "^14.0.0",
"@metamask/profile-sync-controller": "^0.9.7",
"@metamask/ppom-validator": "0.36.0",
"@metamask/preferences-controller": "^15.0.1",
"@metamask/profile-sync-controller": "^2.0.0",
"@metamask/react-native-actionsheet": "2.4.2",
"@metamask/react-native-button": "^3.0.0",
"@metamask/react-native-payments": "^2.0.0",
Expand All @@ -180,9 +180,9 @@
"@metamask/rpc-errors": "^7.0.1",
"@metamask/scure-bip39": "^2.1.0",
"@metamask/sdk-communication-layer": "0.29.0-wallet",
"@metamask/selected-network-controller": "^18.0.2",
"@metamask/signature-controller": "^22.0.0",
"@metamask/slip44": "3.1.0",
"@metamask/selected-network-controller": "^19.0.0",
"@metamask/signature-controller": "^23.1.0",
"@metamask/slip44": "^4.1.0",
"@metamask/smart-transactions-controller": "^15.0.0",
"@metamask/snaps-controllers": "^9.13.0",
"@metamask/snaps-execution-environments": "^6.10.0",
Expand Down
Loading

0 comments on commit d5c6b7b

Please sign in to comment.