PeterYinusa 0930f8093f Resolve merge conflicts ... Remove changes from https://github.com/MetaMask/metamask-extension/pull/16740 in https://github.com/MetaMask/metamask-extension/pull/17437		2023-02-07 13:36:44 +00:00
..
__mocks__	Refactoring isManifestV3 variable (#15568)	2022-08-16 20:51:42 +05:30
components	Display a warning and gas fee component for token allowance and NFT flow when transaction is expected to fail (#17437)	2023-02-06 19:30:26 +00:00
contexts	i18n: fix missing locale for "en" error (#17014)	2022-12-22 12:02:48 +01:00
css	Added padding/margin inline support to the Box component (#17134)	2023-01-14 10:54:25 +05:30
ducks	Merge remote-tracking branch 'origin/master' into Version-v10.25.0	2023-02-01 14:50:26 -07:00
helpers	Disable eth_sign by default, allow users to toggle it back on (#17308)	2023-02-06 19:43:36 +00:00
hooks	Fix speed up of 0 max priority fee transactions (#17547)	2023-02-06 19:37:30 +00:00
pages	Resolve merge conflicts	2023-02-07 13:36:44 +00:00
selectors	Merge remote-tracking branch 'origin/master' into Version-v10.25.0	2023-02-01 14:50:26 -07:00
store	Disable eth_sign by default, allow users to toggle it back on (#17308)	2023-02-06 19:43:36 +00:00
index.js	refactor sentryHooks object (#16435)	2022-11-09 19:28:32 +00:00
index.test.js	Remove related UI code from the app dir (#15384)	2022-09-16 14:05:21 -05:00