Skip to content

Commit

Permalink
Merge pull request #27287 from MetaMask/Version-v12.4.0
Browse files Browse the repository at this point in the history
Version v12.4.0 RC
  • Loading branch information
danjm authored Oct 8, 2024
2 parents 762b968 + dfbead6 commit 73ad771
Show file tree
Hide file tree
Showing 654 changed files with 13,778 additions and 28,137 deletions.
89 changes: 0 additions & 89 deletions .github/scripts/add-team-label.ts

This file was deleted.

4 changes: 3 additions & 1 deletion .github/workflows/add-team-label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:

jobs:
add-team-label:
uses: metamask/github-tools/.github/workflows/add-team-label.yml@main
uses: metamask/github-tools/.github/workflows/add-team-label.yml@058012b49ff2fbd9649c566ba43b29497f93b21d
permissions:
pull-requests: write
secrets:
PERSONAL_ACCESS_TOKEN: ${{ secrets.RELEASE_LABEL_TOKEN }}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,5 @@ licenseInfos.json
# API Spec tests
html-report/

/app/images/branding

4 changes: 4 additions & 0 deletions .storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ module.exports = {
config.resolve.alias['../../../../../../store/actions'] = require.resolve(
'../ui/__mocks__/actions.js',
);
// Import within controller-utils crashes storybook.
config.resolve.alias['@ethereumjs/util'] = require.resolve(
'../ui/__mocks__/ethereumjs-util.js',
);
config.resolve.fallback = {
child_process: false,
constants: false,
Expand Down
36 changes: 11 additions & 25 deletions .storybook/test-data.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { draftTransactionInitialState } from '../ui/ducks/send';
import { KeyringType } from '../shared/constants/keyring';
import { NetworkType } from '@metamask/controller-utils';
import { NetworkStatus } from '@metamask/network-controller';
import { EthAccountType } from '@metamask/keyring-api';
import { CHAIN_IDS } from '../shared/constants/network';
import { copyable, divider, heading, panel, text } from '@metamask/snaps-sdk';
import { getJsxElementFromComponent } from '@metamask/snaps-utils';
import { FirstTimeFlowType } from '../shared/constants/onboarding';
import { ETH_EOA_METHODS } from '../shared/constants/eth-methods';
import { mockNetworkState } from '../test/stub/networks';

const state = {
invalidCustomNetwork: {
Expand Down Expand Up @@ -181,15 +181,6 @@ const state = {
1559: true,
},
},
selectedNetworkClientId: NetworkType.mainnet,
networksMetadata: {
[NetworkType.mainnet]: {
EIPS: {
1559: true,
},
status: NetworkStatus.Available,
},
},
gasFeeEstimates: '0x5208',
swapsState: {
quotes: {},
Expand Down Expand Up @@ -705,13 +696,6 @@ const state = {
connectedStatusPopoverHasBeenShown: true,
swapsWelcomeMessageHasBeenShown: true,
defaultHomeActiveTabName: 'Tokens',
providerConfig: {
type: 'sepolia',
ticker: 'ETH',
nickname: 'Sepolia',
rpcUrl: '',
chainId: '0xaa36a7',
},
network: '5',
accounts: {
'0x64a845a5b02460acf8a3d84503b0d68d028b4bb4': {
Expand Down Expand Up @@ -1234,21 +1218,23 @@ const state = {
accounts: ['0x9d0ba4ddac06032527b140912ec808ab9451b788'],
},
],
networkConfigurations: {
'test-networkConfigurationId-1': {
...mockNetworkState({
id: 'test-networkConfigurationId-1',
rpcUrl: 'https://testrpc.com',
chainId: '0x1',
nickname: 'mainnet',
rpcPrefs: { blockExplorerUrl: 'https://etherscan.io' },
},
'test-networkConfigurationId-2': {
blockExplorerUrl: 'https://etherscan.io',
metadata: {
EIPS: { 1559: true },
status: NetworkStatus.Available,
}
}, {
id: 'test-networkConfigurationId-2',
rpcUrl: 'http://localhost:8545',
chainId: '0x539',
ticker: 'ETH',
nickname: 'Localhost 8545',
rpcPrefs: {},
},
},
}),
accountTokens: {
'0x64a845a5b02460acf8a3d84503b0d68d028b4bb4': {
'0x1': [
Expand Down

This file was deleted.

Loading

0 comments on commit 73ad771

Please sign in to comment.