1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-27 04:46:10 +01:00
Commit Graph

15916 Commits

Author SHA1 Message Date
ryanml
83d74b6c40
Merge pull request #17301 from MetaMask/master-sync
Sync `master` with `develop`
2023-01-19 13:18:50 -07:00
ryanml
48e518d91f Cleaning up merge 2023-01-19 12:10:43 -07:00
ryanml
c67acb7411 Merge remote-tracking branch 'origin/develop' into master-sync 2023-01-19 11:56:06 -07:00
Nidhi Kumari
90d2ca0727
updated initial state of new imported nfts to expanded (#17285) 2023-01-19 23:01:13 +05:30
Nidhi Kumari
0fdff8955c
added title for each nft in asset dropdown (#17286) 2023-01-19 23:00:35 +05:30
Dan J Miller
c2be2ce6be
Merge pull request #16840 from MetaMask/Version-v10.24.0
Version v10.24.0
2023-01-19 13:52:26 -03:30
Dan J Miller
0a37e83aea
Merge pull request #17281 from MetaMask/update-v10.24-changelog
Update CHANGELOG.md
2023-01-19 12:19:06 -03:30
Dan J Miller
45fa923814 Clarify effect of autodetect tokens toggle (#17293)
* Clarify effect of autodetect tokens toggle

* Fix test

Co-authored-by: Nidhi Kumari <nidhi.kumari@consensys.net>
2023-01-19 15:10:40 +00:00
Dan J Miller
f4391bb5c4 Allow user to scroll network form in onboarding modal (#17291) 2023-01-19 15:10:24 +00:00
Danica Shen
8f915807e4
fix(mme-14830): fix consistent tab when switching languages (#17155) 2023-01-19 15:05:42 +00:00
Dan J Miller
c90d389b84
Clarify effect of autodetect tokens toggle (#17293)
* Clarify effect of autodetect tokens toggle

* Fix test

Co-authored-by: Nidhi Kumari <nidhi.kumari@consensys.net>
2023-01-19 11:33:08 -03:30
Brad Decker
e830176fc8
fix issue with network state shape expected in NftDetectionController (#17283) 2023-01-19 08:17:47 -06:00
Dan J Miller
9a8bb81358
Allow user to scroll network form in onboarding modal (#17291) 2023-01-19 10:44:47 -03:30
Dan J Miller
34c4122013
Update forking-mainnet-for-testing.md (#16235)
* Update forking-mainnet-for-testing.md

Add missing important piece of documentation

* Update docs/forking-mainnet-for-testing.md

Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com>

* Update docs/forking-mainnet-for-testing.md

Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com>

* Update for yarn 3

Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com>
2023-01-19 06:18:53 -07:00
ryanml
63a3de6768
Various NFT UI fixes (#17153)
* Various NFT UI fixes

* Addressing review feedback

* Using ButtonIcon component for copy icon

* Using button for collectible item
2023-01-18 15:39:15 -07:00
PeterYinusa
4f118feaad Update CHANGELOG.md 2023-01-18 22:28:31 +00:00
Thomas Huang
d99854baac
Convert signature request component to tlr. (#17268) 2023-01-18 11:34:28 -08:00
Thomas Huang
fae2a02d1c
Bump @testing-library/react-hooks dependency. (#17271)
* Bump @testing-library/react-hooks from `v3.2.1` to `v8.0.1`

* Lavamoat policy changes with dep bump
2023-01-18 10:49:56 -08:00
PeterYinusa
a464f128bc Update test-snap-notification.spec.js 2023-01-18 18:36:51 +00:00
PeterYinusa
fbea2f7c53 update more snaps tests 2023-01-18 17:48:07 +00:00
PeterYinusa
5380ec5e15 update address path snap e2e tests 2023-01-18 16:37:30 +00:00
Olusegun Akintayo
d7e829ed5a
Persist phishing state controller state. (#16643)
* Persist phishing state controller state.

Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com>

update phishing controller to latest version

Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com>

Rebase, Yarn3, Lavamoat

Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com>

run allow-scrips.

Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com>

lavamoat:auto and linter

Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com>

* lint fixes

Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com>

Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com>
2023-01-18 16:44:19 +01:00
Ariella Vu
2d6529bc5c
GasDisplay: hide duplicate testnet value (#17207)
- when isTestnet && !showFiatInTestnets
2023-01-18 22:43:40 +07:00
PeterYinusa
0dc6be8e14 lint 2023-01-18 14:57:20 +00:00
ryanml
90dda81900 Update copy and fix duplicate entries for Token Detection Settings search results (#17273) 2023-01-18 14:55:41 +00:00
PeterYinusa
5a9d6333bd Fix e2e test 2023-01-18 14:49:06 +00:00
Brad Decker
5f6d2ba6b0
Convert Transaction constants to typescript (#17149) 2023-01-18 08:47:29 -06:00
ryanml
d8ce8612bd
Update copy and fix duplicate entries for Token Detection Settings search results (#17273) 2023-01-18 11:13:57 -03:30
David Walsh
37174d749c
Fix #17162 - Add NFT disclaimer to details page (#17266) 2023-01-18 08:37:16 -06:00
Niranjana Binoy
20cbe44d63
Moving transaction-alerts component from /ui/pages/confirm-transaction folder to ui/component/app folder (#17272) 2023-01-18 09:30:26 -05:00
weizman
6d551f10fe
Update LavaMoat (core/lavapack) (#17061) 2023-01-18 14:35:37 +02:00
seaona
1c687180fd lavamoat:auto 2023-01-18 11:14:51 +01:00
Vladimir Saric
c82c967c46
Fixing error when user input some letter in token allowance flow (#17117)
* Fixing error when user input some letter in token allowance flow

* Rename the regex variable name and added a brief comment above its definition

Co-authored-by: Pedro Figueiredo <pedro.figueiredo@consensys.net>
2023-01-18 10:53:10 +01:00
ryanml
1df1955276
Update @metamask/contract-metadata to v2.2.0 (#17230) 2023-01-18 01:08:10 -07:00
ryanml
a276208891
Fixing broken stories (#17227) 2023-01-17 18:42:02 -07:00
Mark Stacey
7d77554f3b
Refactor: Construct the network controller within each test (#17199)
The network controller is now constructed within each network
controller unit test, rather than in the `beforeEach`. This allows us
to customize the constructor options in each test, which some planned
future tests will require.

The controller is constructed with a helper function that also handles
calling `destroy` after each test, even if the test failed. This helps
to prevent tests from affecting each other.

Co-authored-by: Elliot Winkler <elliot.winkler@gmail.com>
2023-01-17 19:58:16 -03:30
Mark Stacey
3c52e80713
Remove unnecessary test (#17181)
This test was testing a function that was only present in the test
module.

The function under test was mistakenly moved here when it was
discovered that it wasn't being used elsewhere, under the assumption
that it was used in these tests. I hadn't realized it was being tested
directly.
2023-01-17 19:57:41 -03:30
aleksandar-mihajlovic
48dd819763
Fix for showing warning when no pending confirmations when network switching (#17179) 2023-01-17 15:37:35 -06:00
aleksandar-mihajlovic
082772fd08
Fix for contacts tab alignment bugs (#17171) 2023-01-17 15:36:33 -06:00
PeterYinusa
59694cfac6 deduplicate dependencies 2023-01-17 20:56:14 +00:00
David Walsh
7d616fa513
NFTs: Add proper padding to import warning (#17202) 2023-01-17 14:26:16 -06:00
PeterYinusa
c601ca4b79 update lavamoat policies 2023-01-17 20:06:27 +00:00
PeterYinusa
5914b8f6b6 update dependencies 2023-01-17 20:01:58 +00:00
Niranjana Binoy
ca68e0e197 Toggle option to enable/disable balance and Token rate checking for using third-party API (#16772) 2023-01-17 18:41:47 +00:00
Jyoti Puri
a5a775bcfd
Update eth-json-rpc-filters (#17193) 2023-01-17 23:54:06 +05:30
Mark Stacey
61d8fbb1d4
Refactor: Use network mocks for network unit tests (#17126)
The network controller unit tests now use network mocks rather than
mocking controller methods.

This makes the tests less brittle, as they will no longer break when
internal changes to the `_getLatestBlock` method are made.
2023-01-17 14:39:02 -03:30
Thomas Huang
4c3c4eebac
Final conversion of tests from enzyme to @testing-library/react (#16862)
* Add transaction activity log component

* Remove duplicate tx activity log snapshot.

* Convert Advanced Tab to tlr.

* Lint fix

* Change ENS to DNS in mock state data.

* Add test ids for speedup, cancel, rety buttons.

* Convert TransactionListItemDetails component to RTL.

* Convert PageContainerHeader component to RTL.

* Convert TokenInput component to RTL.

* Convert UnitInput component to RTL.

* Convert withModalProps to RTL.

* Convert i18n-helper to RTL.

* Convert ConfirmSeedPhrase component to TLR.

* Convert AddRecipient component to RTL.

* Set process.env metamask build type to 'main' for test

Co-authored-by: Brad Decker <bhdecker84@gmail.com>
Co-authored-by: Pedro Figueiredo <pedro.figueiredo@consensys.net>
2023-01-17 07:51:35 -08:00
Niranjana Binoy
a0bb4a6c5a
Toggle option to enable/disable balance and Token rate checking for using third-party API (#16772) 2023-01-17 10:23:04 -05:00
David Walsh
554939cc66
Fix #17142 - Ensure toggle arrow is visible in dark mode (#17204) 2023-01-17 09:19:26 -06:00
Michal
49c8b279be
harden export account (#17241)
harden export account
2023-01-17 15:01:12 +00:00