* origin/develop: (45 commits)
eth-block-tracker@5.0.1 (#10737)
Allow 11 characters in symbol for RPC (#10670)
security - update SES lockdown (#10663)
build - refactor build system for easier configuration (#10718)
ci - cache deps before patch-package (#10735)
Additional swaps network support (#10721)
Update @metamask/controllers to v6.2.1 (#10701)
Fix 10562 - Hide the suggested token pane when not on Mainnet or test network (#10702)
Fix mismatchedChain typo in custom network approval screen (#10723)
Fix 10706 - Prevent autocomplete from add token input (#10700)
fix: remove unused `metamask.rpcUrl` from redux state + fix tests to reflect that (#10714)
rule out empty string for symbol (#10712)
Removing hard references to 12 word seed phrases in copy (#10704)
Add MetaMask to list of BIP44 HD path examples (#10703)
resolve issue with missing template error (#10692)
Delete setupFetchDebugging.js (#10636)
Excluding sourcemaps comment in production builds (#10695)
deps - remove "remotedev-server" (#10687)
Adding default properties to NetworkForm (#10682)
make migration more safe (#10689)
...
"message":"Import your existing wallet using a 12 word seed phrase"
"message":"Import your existing wallet using a seed phrase"
},
"imported":{
"message":"Imported",
@ -1064,7 +1064,7 @@
"message":"MetaMask would like to gather usage data to better understand how our users interact with the extension. This data will be used to continually improve the usability and user experience of our product and the Ethereum ecosystem."
},
"mismatchedChain":{
"message":"This network details for this Chain ID do not match our records. We recommend that you $1 before proceeding.",
"message":"The network details for this chain ID do not match our records. We recommend that you $1 before proceeding.",
"description":"$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
},
"mismatchedChainLinkText":{
@ -1455,7 +1455,7 @@
"message":"WARNING: Never disclose your backup phrase. Anyone with this phrase can take your Ether forever."
},
"secretPhrase":{
"message":"Enter your secret twelve word phrase here to restore your vault."
"message":"Enter your secret phrase here to restore your vault."
},
"securityAndPrivacy":{
"message":"Security & Privacy"
@ -1511,9 +1511,6 @@
"sendAmount":{
"message":"Send Amount"
},
"sendETH":{
"message":"Send ETH"
},
"sendSpecifiedTokens":{
"message":"Send $1",
"description":"Symbol of the specified token"
@ -2221,6 +2218,9 @@
"walletSeed":{
"message":"Seed phrase"
},
"walletSeedRestore":{
"message":"Wallet Seed"
},
"web3ShimUsageNotification":{
"message":"We noticed that the current website tried to use the removed window.web3 API. If the site appears to be broken, please click $1 for more information.",
it('should return a simple send transactionCategory with a 0x getCodeResponse when there is data and but the to address is not a contract address',asyncfunction(){
it('should return a simple send transactionCategory with a null getCodeResponse when to is truthy and there is data and but getCode returns an error',asyncfunction(){
it('should return a simple send type with a null getCodeResponse when to is truthy and there is data and but getCode returns an error',asyncfunction(){
it('should return a contract interaction transactionCategory with the correct getCodeResponse when to is truthy and there is data and it is not a token transaction',asyncfunction(){
it('should return a contract interaction type with the correct getCodeResponse when to is truthy and there is data and it is not a token transaction',asyncfunction(){
const_providerResultStub={
// 1 gwei
eth_gasPrice:'0x0de0b6b3a7640000',
@ -875,17 +874,17 @@ describe('Transaction Controller', function () {
it('should return a contract interaction transactionCategory with the correct getCodeResponse when to is a contract address and data is falsy',asyncfunction(){
it('should return a contract interaction type with the correct getCodeResponse when to is a contract address and data is falsy',asyncfunction(){
const_providerResultStub={
// 1 gwei
eth_gasPrice:'0x0de0b6b3a7640000',
@ -915,12 +914,12 @@ describe('Transaction Controller', function () {
it('should be able to make an rpc request/response with the method and params and node-style callback with multiple instances of metaRPCClientFactory and the same connectionStream',function(done){
Mark Stacey
4 years ago
