1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-10-22 11:22:43 +02:00
Commit Graph

13807 Commits

Author SHA1 Message Date
ryanml
fa467d1b8c
Merge pull request #13656 from MetaMask/master-sync
Sync `master` with `develop`
2022-02-16 22:36:31 -07:00
Benjamin Bourgeois
207436d11c
convert SendGasRow stories with argtypes (#13554) 2022-02-16 15:18:30 -08:00
ryanml
2fe2741264 Merge remote-tracking branch 'origin/develop' into master-sync 2022-02-16 14:50:59 -07:00
ryanml
09c880d165
Merge pull request #13498 from MetaMask/Version-v10.10.0
Version v10.10.0 RC
2022-02-16 14:47:27 -07:00
David Walsh
009c6e1455
Use hardware wallet constants when possible (#13634) 2022-02-16 14:54:30 -06:00
Ariella Vu
fadad601b8
ConfirmImportToken: Convert to Functional Component; Add storybook controls (#13594)
* ConfirmImportToken: convert to FC

* ConfirmImportToken: reorganize

* ConfirmImportToken: rm component from path

* replace mapStateToProps w/ useSelector
ConfirmImportToken

* replace mapDispatchToProps w/ useDispatch
ConfirmImportToken

* ConfirmAddSuggestedToken: useHistory

* ConfirmImportToken: add storybook controls

* ConfirmImportToken: rm 1st entry overwrite

* ConfirmImportToken: add tests

* ConfirmImportToken: use real Redux store in tests

* ConfirmImportToken: do not use mock-state.json
https://github.com/MetaMask/metamask-extension/pull/13594#discussion_r805022647

* ConfirmImportToken: tokenAddedEvent -> trackTokenAddedEvent

* Update ui/pages/confirm-import-token/confirm-import-token.js

Co-authored-by: Elliot Winkler <elliot.winkler@gmail.com>

* ConfirmImportToken: update useSelector logic

* ConfirmImportToken: replace typeof check w/ === undefined

* ConfirmImportToken: rm unnecessary /rendering from path

* ConfirmImportToken: fix add token redirect

* ConfirmImportToken: use useNewMetricEvent

* ConfirmImportToken: rename vars using "addedToken"

* ConfirmImportToken: setAddedToken to obj copy

Co-authored-by: Elliot Winkler <elliot.winkler@gmail.com>
2022-02-16 18:03:54 +00:00
ryanml
b954ca447d
Ensure pre-selected account on connect screen is visible in list (#13621)
* Ensure pre-selected account on connect screen is visible in list

* adding smooth scroll behavior

* Change conditional
2022-02-16 11:00:44 -07:00
ryanml
b3f90f7031
Merge pull request #13648 from MetaMask/master-sync
Sync `master` with `develop`
2022-02-16 10:56:33 -07:00
ryanml
e069c5a960 Fix changelog 2022-02-16 10:49:52 -07:00
ryanml
fe061bb2e6 Merge remote-tracking branch 'origin/master' into Version-v10.10.0 2022-02-16 10:48:22 -07:00
dragana8
5095071083
Make default icons the same on mobile and extension #13264 (#13408) 2022-02-16 11:03:17 -06:00
VSaric
2cd242252f
Created "Token details" page (#13216)
* Created new screen/page "Token details"

* Change color in scss

* Modify elements to the latest requirements and added unit tests

* Review requested changes

* Condensing files into one component

* Added unit tests for token details page

* Added redirection when switching networks, added image for a token and update unit tests

* Requested review changes

* Modify index.scss regarding of the requested review

* Delete data-testid's from Typography and token-details-page.js

* Requested review changes
2022-02-16 13:29:39 -03:30
mradziwon
3735a601d9
Update outdated Trezor Emulator link (#13611) 2022-02-16 10:15:22 -06:00
PeterYinusa
ebeb2668ea
E2e mocking (#13640)
* mock gas price api

* fix error

* full url

* remove duplicated packages

* full url

* customise mock per test

* customise mock per test

* enable mocking

* enable mocking

* enable mocking by default

* duplicated packages

* update mockttp

* pass through

* pass through
2022-02-16 14:21:41 +00:00
Thomas Huang
8fecb28844 Merge remote-tracking branch 'origin/develop' into master-sync 2022-02-15 18:26:43 -08:00
Dan J Miller
f2921ce84d
Merge pull request #13644 from MetaMask/Version-v10.9.3
Version v10.9.3 RC
2022-02-15 22:37:03 -03:30
Dan J Miller
a83ce7486b Ensure sign message button is only enabled on scroll (#13645)
* Ensure sign message button is only enabled on scroll

* Add button for message scrolling to signature request screen

* lint fix

* Only show scroll button if message is scrollable

Co-authored-by: ryanml <ryanlanese@gmail.com>
2022-02-15 17:00:47 -07:00
Dan J Miller
d1c5274738
Ensure sign message button is only enabled on scroll (#13645)
* Ensure sign message button is only enabled on scroll

* Add button for message scrolling to signature request screen

* lint fix

* Only show scroll button if message is scrollable

Co-authored-by: ryanml <ryanlanese@gmail.com>
2022-02-15 16:59:59 -07:00
ryanml
e4e321cc7c Fix lockfile 2022-02-15 12:25:46 -07:00
dependabot[bot]
bcf826772e Bump vm2 from 3.9.5 to 3.9.7 (#13625)
Bumps [vm2](https://github.com/patriksimek/vm2) from 3.9.5 to 3.9.7.
- [Release notes](https://github.com/patriksimek/vm2/releases)
- [Changelog](https://github.com/patriksimek/vm2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/patriksimek/vm2/compare/3.9.5...3.9.7)

---
updated-dependencies:
- dependency-name: vm2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Dan J Miller <danjm.com@gmail.com>
2022-02-15 12:18:51 -07:00
dependabot[bot]
1d1752135e Bump follow-redirects from 1.14.7 to 1.14.8 (#13612)
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-15 12:18:35 -07:00
Dan J Miller
2dc9ce71dd Add resolution for engine.io, a nested dependency of 3box (#13589) 2022-02-15 12:16:12 -07:00
ryanml
48685ed462 Updating Changelog 2022-02-15 12:00:02 -07:00
MetaMask Bot
7694f5ef52 Version v10.9.3 2022-02-15 18:55:01 +00:00
ryanml
089e0b9f5c Fixing sign type data message formatting, requiring content scroll before sign (#13642)
* Fixing signature request formatting, requiring scroll before sign

* Ensure sign button not disable when no scroll is required

* Test fix attempt #1

* Clean up e2e tests

Co-authored-by: Dan Miller <danjm.com@gmail.com>
2022-02-15 11:49:14 -07:00
ryanml
40269ad13c
Fixing sign type data message formatting, requiring content scroll before sign (#13642)
* Fixing signature request formatting, requiring scroll before sign

* Ensure sign button not disable when no scroll is required

* Test fix attempt #1

* Clean up e2e tests

Co-authored-by: Dan Miller <danjm.com@gmail.com>
2022-02-15 11:39:57 -07:00
dependabot[bot]
3dc60e8e30
Bump vm2 from 3.9.5 to 3.9.7 (#13625)
Bumps [vm2](https://github.com/patriksimek/vm2) from 3.9.5 to 3.9.7.
- [Release notes](https://github.com/patriksimek/vm2/releases)
- [Changelog](https://github.com/patriksimek/vm2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/patriksimek/vm2/compare/3.9.5...3.9.7)

---
updated-dependencies:
- dependency-name: vm2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Dan J Miller <danjm.com@gmail.com>
2022-02-15 14:07:20 -03:30
dependabot[bot]
3fb21fee27
Bump follow-redirects from 1.14.7 to 1.14.8 (#13612)
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-15 06:35:30 -03:30
Erik Marks
35ac762e10
Add Snaps via Flask (#13462)
This PR adds `snaps` under Flask build flags to the extension. This branch is mostly equivalent to the current production version of Flask, excepting some bug fixes and tweaks.

Closes #11626
2022-02-14 16:02:51 -08:00
Jyoti Puri
c0d03ea70a Fix: advance defaults should never be used for swaps (#13617) 2022-02-14 12:10:28 -07:00
Jyoti Puri
2b5b787ca9
Fix: advance defaults should never be used for swaps (#13617) 2022-02-15 00:37:46 +05:30
Niranjana Binoy
b42e1f75fa
Include transactions from all networks in state logs (#13599) 2022-02-14 13:29:24 -05:00
PeterYinusa
2b1256faf4
Update to latest ChromeDriver (#13616) 2022-02-14 17:06:10 +00:00
ryanml
2ad0b85cb1
Untranslated string fix (#13615) 2022-02-14 08:52:04 -07:00
Dan Finlay
f4a25cb153 Correct connection language (#13605)
* Correct connection language

Fixes #13604

Does not initiate transactions, but suggests them.

* Update app/_locales/en/messages.json
2022-02-11 14:55:03 -07:00
Dan Finlay
c01c312d5d
Correct connection language (#13605)
* Correct connection language

Fixes #13604

Does not initiate transactions, but suggests them.

* Update app/_locales/en/messages.json
2022-02-11 13:35:43 -08:00
Jyoti Puri
e49430f3d9 Fixes in EIP-1559 V2 implementation (#13574)
* Fixes in EIP-1559 V2 implementation

* Adding check for transaction.id in useTransactionEventFragment hook

* Update ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js

Co-authored-by: Alex Donesky <adonesky@gmail.com>

* fix

* fix

* fix

* fix

* fix

* fix build

Co-authored-by: Dan J Miller <danjm.com@gmail.com>
Co-authored-by: Alex Donesky <adonesky@gmail.com>
2022-02-11 11:01:13 -03:30
Jyoti Puri
eb39290dcd
Fixes in EIP-1559 V2 implementation (#13574)
* Fixes in EIP-1559 V2 implementation

* Adding check for transaction.id in useTransactionEventFragment hook

* Update ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js

Co-authored-by: Alex Donesky <adonesky@gmail.com>

* fix

* fix

* fix

* fix

* fix

* fix build

Co-authored-by: Dan J Miller <danjm.com@gmail.com>
Co-authored-by: Alex Donesky <adonesky@gmail.com>
2022-02-11 10:59:17 -03:30
Mark Stacey
aaca267a7b Update LavaMoat policy files
These changes were generated by running `yarn lavamoat:auto`
2022-02-10 20:55:02 -03:30
Jyoti Puri
95eefc9630 Adding check for transaction.id in useTransactionEventFragment hook (#13587) 2022-02-10 16:59:34 -07:00
Niranjana Binoy
64706c5021 Updating the direct deposit messages to native currency (#13576) 2022-02-10 16:59:15 -07:00
Dan J Miller
44cb377ec0 Add resolution for engine.io, a nested dependency of 3box (#13589) 2022-02-10 16:55:44 -07:00
Dan J Miller
4bb4ab460c
Update Changelog v10.10.0 (#13596)
* Update Changelog v10.10.0

* Fix changelog lint

Co-authored-by: ryanml <ryanlanese@gmail.com>
2022-02-10 16:55:03 -07:00
Dan J Miller
8597cd1401
Allow sending up to 15 decimals on the send screen (#12707) 2022-02-10 17:35:41 -05:00
Elliot Winkler
8f2144fdb0
Suppress diffs for translation files by default (#13537)
In feature branches, it is very common to make ancillary changes to
translation files. For instance, a key may be no longer in use, so in
order to satisfy CI, it must be removed across all translation files.
These changes can make reviewing PRs difficult, as one has to scroll
past them in order to find the more impactful changes. To address this
problem, this commit updates `.gitattributes` to suppress diffs
involving translation files by default.

A tradeoff to this change is that it will make it more difficult to
review PRs whose sole purpose is to update translations. That said, for
small PRs submitted by contributors, it is likely that only one or two
translation files will be updated, so it is easy to expand the diffs for
such files. For larger PRs such as those submitted by Crowdin, these
diffs are so large that GitHub ends up suppressing them anyway.

If this ends up being bothersome, one way to work around this is to use
the [Refined GitHub][1] browser extension, which allows you to
Alt/Opt-click on a single "Load diff" message to load all diffs which
are currently suppressed. So at most this would take one click to solve.

[Refined GitHub]: https://github.com/refined-github/refined-github
2022-02-10 14:49:47 -07:00
Alex Donesky
7223d4cd2c
fix opensea/autodetect setting dependency relation (#13575) 2022-02-10 14:02:06 -06:00
Alex Donesky
7148607906
remove infura project_id from networks form field (#13539)
* remove infura project_id from networks form field
2022-02-10 13:23:52 -06:00
Niranjana Binoy
59b0ae4b40
Updating the direct deposit messages to native currency (#13576) 2022-02-10 13:27:29 -05:00
Dan Miller
b0dfe2109c Merge branch 'master' into Version-v10.10.0 2022-02-10 14:28:23 -03:30
Dan J Miller
e84138e2bc
Add resolution for engine.io, a nested dependency of 3box (#13589) 2022-02-10 13:54:36 -03:30