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.

Sign up for GitHub

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

feat: upgrade assets controllers to version 33 #25484

Merged
merged 17 commits into from
Jun 27, 2024
Merged

feat: upgrade assets controllers to version 33 #25484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
537cb44
feat: upgrade assets controllers to version 33
bergeron Jun 24, 2024
d7ea726
fix missing action
bergeron Jun 24, 2024
ded32c6
fix unit test
bergeron Jun 24, 2024
65ea16b
fix unit test
bergeron Jun 24, 2024
9a08129
Update LavaMoat policies
metamaskbot Jun 24, 2024
abe67d5
Merge branch 'develop' into brian/upgrade-assets-controllers-33
bergeron Jun 24, 2024
0879715
Merge branch 'develop' of github.com:MetaMask/metamask-extension into…
bergeron Jun 24, 2024
695798e
fix e2e test
bergeron Jun 24, 2024
b35841c
Merge branch 'develop' of github.com:MetaMask/metamask-extension into…
bergeron Jun 25, 2024
ea99f11
Update LavaMoat policies
metamaskbot Jun 25, 2024
e5df0af
Merge branch 'develop' of github.com:MetaMask/metamask-extension into…
bergeron Jun 26, 2024
2c5ab98
yarn
bergeron Jun 26, 2024
91d51cb
yarn
bergeron Jun 26, 2024
e192f9e
Merge branch 'develop' into brian/upgrade-assets-controllers-33
bergeron Jun 27, 2024
7511f38
Update LavaMoat policies
metamaskbot Jun 27, 2024
dd6939a
Merge branch 'develop' of github.com:MetaMask/metamask-extension into…
bergeron Jun 27, 2024
99b03f1
yarn
bergeron Jun 27, 2024
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
13 changes: 0 additions & 13 deletions .yarn/patches/@metamask-assets-controllers-npm-30.0.0-8747c20871.patch
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions .yarn/patches/@metamask-assets-controllers-patch-26d4328777.patch
View file
Open in desktop

This file was deleted.

251 changes: 0 additions & 251 deletions .yarn/patches/@metamask-assets-controllers-patch-a3b39b55a6.patch
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions app/scripts/metamask-controller.actions.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,11 +222,6 @@ describe('MetaMaskController', function () {
const decimals = 18;

it('two parallel calls with same token details give same result', async function () {
const supportsInterfaceStub = jest.fn().mockResolvedValue(false);
jest
.spyOn(metamaskController.tokensController, '_createEthersContract')
.mockResolvedValue({ supportsInterface: supportsInterfaceStub });

const [token1, token2] = await Promise.all([
metamaskController.getApi().addToken({ address, symbol, decimals }),
metamaskController.getApi().addToken({ address, symbol, decimals }),
Expand All @@ -235,10 +230,6 @@ describe('MetaMaskController', function () {
});

it('networkClientId is used when provided', async function () {
const supportsInterfaceStub = jest.fn().mockResolvedValue(false);
jest
.spyOn(metamaskController.tokensController, '_createEthersContract')
.mockResolvedValue({ supportsInterface: supportsInterfaceStub });
const callSpy = jest
.spyOn(metamaskController.controllerMessenger, 'call')
.mockReturnValue({ configuration: { chainId: '0xa' } });
Expand Down
Loading