* origin/develop:
Position the 3dot menu in the same spot on asset screen and home screen (#10642)
Move swaps constants to the shared constants directory (#10614)
prefer chainId over networkId in most cases (#10594)
no more node:console (#10640)
fix: speedup cancellation (#10579)
Setting balance to 0x0 when the original value is undefined (#10634)
Hide zero balance tokens at useTokenTracker layer (#10630)
Removing double click bug from delete custom network modal (#10628)
remove transactionCategory in favor of more types (#10615)
Ensure permission log will only store JSON-able data (#10524)
Replace logic for eth swap token in fetchQuotesAndSetQuoteState with getSwapsEthToken call (#10624)
add trezor HD path for ledger wallets (#10616)
* Unifies the filename suffix to .test.js
* Display @babel/no-invalid-this rule for tx-controller.test.js
* Add test file extension to test:unit:global
The `elliptic` package has been updated to v6.5.4 to address a security
advisory regarding a vulnerability in v6.5.3. We are not affected by
this vulnerability to the best of our knowledge. This is just to stay
on the safe side, and fix our audit check.
In #10510 we changed how tokens are stored, keying them by `chainId`
rather than network type. However we didn't update our mobile sync
function to account for this, which ended up breaking the filtering
logic used to prepare the data that is synced.
Specifically, custom tokens added by users are filtered out to just
those that are confirmed to be ERC20 tokens in our built-in list of
tokens. This filters out unrecognized tokens and NFTs.
The filtering logic has been restored to the pre-#10510 behaviour.
* origin/develop:
Updating references to MetaMask support (#10563)
Remove dead code related to the selectedFromToken variable in swaps/index.js (#10570)
make lavamoat optional for dev mode (#10538)
Adding a warning when sending a token to its own contract address (#10546)
handle undefined network (#10560)
cache balances by chain id (#10545)
Fix/handle safe low undefined (#10561)
Remove unused `hasHexData` prop (#10529)
Resolving pull-ws to v3.3.2 (#10543)
Sync `master` with `develop` (#10540)
ryanml
Brad Decker
David Walsh
Dan J Miller
Mark Stacey
Shane
Niranjana Binoy
Erik Marks
MetaMask Bot
Thomas Huang
matteopey