Skip to content

Commit

Permalink
Merge branch 'develop' into e2e/settings-about-metamask-links-test
Browse files Browse the repository at this point in the history
  • Loading branch information
@HowardBraham
HowardBraham authored Feb 22, 2024
2 parents d4019cf + 3687b18 commit baa70cc
Show file tree
Hide file tree
Showing 20 changed files with 370 additions and 271 deletions.
4 changes: 4 additions & 0 deletions development/ts-migration-dashboard/app/styles/custom-elements.scss
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/*
Disabling Stylelint's hex color rule here because the TypeScript migration dashboard, being external to the main app, doesn't use design tokens.
*/
/* stylelint-disable color-no-hex */
:root {
--blue-gray-350: hsl(209deg 13.7% 62.4%);
--blue-gray-100: hsl(209.8deg 16.5% 89%);
Expand Down
4 changes: 4 additions & 0 deletions development/ts-migration-dashboard/app/styles/tippy.scss
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
/*
Disabling Stylelint's hex color rule here because the TypeScript migration dashboard, being external to the main app, doesn't use design tokens.
*/
/* stylelint-disable color-no-hex */
.tippy-touch {
cursor: pointer !important;
}
Expand Down
70 changes: 28 additions & 42 deletions lavamoat/browserify/beta/policy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@
},
"@metamask/address-book-controller>@metamask/controller-utils>ethjs-unit": {
"packages": {
"@metamask/ethjs>number-to-bn": true,
"@metamask/ethjs>ethjs-abi>number-to-bn": true,
"bn.js": true
}
},
Expand Down Expand Up @@ -1206,16 +1206,16 @@
"@metamask/ethjs>@metamask/ethjs-provider-http": true,
"@metamask/ethjs>@metamask/ethjs-unit": true,
"@metamask/ethjs>@metamask/ethjs-util": true,
"@metamask/ethjs>@metamask/number-to-bn": true,
"@metamask/ethjs>ethjs-abi": true,
"@metamask/ethjs>js-sha3": true,
"@metamask/ethjs>number-to-bn": true,
"bn.js": true,
"browserify>buffer": true
}
},
"@metamask/ethjs-contract": {
"packages": {
"@metamask/ethjs-query>babel-runtime": true,
"@babel/runtime": true,
"@metamask/ethjs>@metamask/ethjs-filter": true,
"@metamask/ethjs>@metamask/ethjs-util": true,
"@metamask/ethjs>ethjs-abi": true,
Expand All @@ -1237,36 +1237,15 @@
"packages": {
"@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
"@metamask/ethjs>@metamask/ethjs-util": true,
"@metamask/ethjs>number-to-bn": true,
"@metamask/ethjs>number-to-bn>strip-hex-prefix": true
"@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
"@metamask/ethjs>@metamask/number-to-bn": true
}
},
"@metamask/ethjs-query>@metamask/ethjs-rpc": {
"packages": {
"promise-to-callback": true
}
},
"@metamask/ethjs-query>babel-runtime": {
"packages": {
"@metamask/ethjs-query>babel-runtime>core-js": true,
"@metamask/ethjs-query>babel-runtime>regenerator-runtime": true
}
},
"@metamask/ethjs-query>babel-runtime>core-js": {
"globals": {
"PromiseRejectionEvent": true,
"__e": "write",
"__g": "write",
"document.createTextNode": true,
"postMessage": true,
"setTimeout": true
}
},
"@metamask/ethjs-query>babel-runtime>regenerator-runtime": {
"globals": {
"regeneratorRuntime": "write"
}
},
"@metamask/ethjs>@metamask/ethjs-filter": {
"globals": {
"clearInterval": true,
Expand All @@ -1285,25 +1264,42 @@
},
"@metamask/ethjs>@metamask/ethjs-unit": {
"packages": {
"@metamask/ethjs>number-to-bn": true,
"@metamask/ethjs>@metamask/number-to-bn": true,
"bn.js": true
}
},
"@metamask/ethjs>@metamask/ethjs-util": {
"packages": {
"@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
"@metamask/ethjs>number-to-bn>strip-hex-prefix": true,
"@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
"browserify>buffer": true
}
},
"@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": {
"packages": {
"@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true
}
},
"@metamask/ethjs>@metamask/number-to-bn": {
"packages": {
"@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
"bn.js": true
}
},
"@metamask/ethjs>ethjs-abi": {
"packages": {
"@metamask/ethjs>ethjs-abi>number-to-bn": true,
"@metamask/ethjs>js-sha3": true,
"@metamask/ethjs>number-to-bn": true,
"bn.js": true,
"browserify>buffer": true
}
},
"@metamask/ethjs>ethjs-abi>number-to-bn": {
"packages": {
"@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
"bn.js": true
}
},
"@metamask/ethjs>js-sha3": {
"globals": {
"define": true
Expand All @@ -1312,17 +1308,6 @@
"browserify>process": true
}
},
"@metamask/ethjs>number-to-bn": {
"packages": {
"@metamask/ethjs>number-to-bn>strip-hex-prefix": true,
"bn.js": true
}
},
"@metamask/ethjs>number-to-bn>strip-hex-prefix": {
"packages": {
"@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true
}
},
"@metamask/gas-fee-controller": {
"globals": {
"clearInterval": true,
Expand Down Expand Up @@ -3169,7 +3154,8 @@
},
"eth-method-registry": {
"packages": {
"@metamask/ethjs": true
"@metamask/ethjs-contract": true,
"@metamask/ethjs-query": true
}
},
"eth-rpc-errors": {
Expand Down Expand Up @@ -3210,7 +3196,7 @@
"eth-sig-util>ethereumjs-util>ethjs-util": {
"packages": {
"@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
"@metamask/ethjs>number-to-bn>strip-hex-prefix": true,
"@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
"browserify>buffer": true
}
},
Expand Down
70 changes: 28 additions & 42 deletions lavamoat/browserify/desktop/policy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@
},
"@metamask/address-book-controller>@metamask/controller-utils>ethjs-unit": {
"packages": {
"@metamask/ethjs>number-to-bn": true,
"@metamask/ethjs>ethjs-abi>number-to-bn": true,
"bn.js": true
}
},
Expand Down Expand Up @@ -1283,16 +1283,16 @@
"@metamask/ethjs>@metamask/ethjs-provider-http": true,
"@metamask/ethjs>@metamask/ethjs-unit": true,
"@metamask/ethjs>@metamask/ethjs-util": true,
"@metamask/ethjs>@metamask/number-to-bn": true,
"@metamask/ethjs>ethjs-abi": true,
"@metamask/ethjs>js-sha3": true,
"@metamask/ethjs>number-to-bn": true,
"bn.js": true,
"browserify>buffer": true
}
},
"@metamask/ethjs-contract": {
"packages": {
"@metamask/ethjs-query>babel-runtime": true,
"@babel/runtime": true,
"@metamask/ethjs>@metamask/ethjs-filter": true,
"@metamask/ethjs>@metamask/ethjs-util": true,
"@metamask/ethjs>ethjs-abi": true,
Expand All @@ -1314,36 +1314,15 @@
"packages": {
"@metamask/ethjs-query>@metamask/ethjs-format>ethjs-schema": true,
"@metamask/ethjs>@metamask/ethjs-util": true,
"@metamask/ethjs>number-to-bn": true,
"@metamask/ethjs>number-to-bn>strip-hex-prefix": true
"@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
"@metamask/ethjs>@metamask/number-to-bn": true
}
},
"@metamask/ethjs-query>@metamask/ethjs-rpc": {
"packages": {
"promise-to-callback": true
}
},
"@metamask/ethjs-query>babel-runtime": {
"packages": {
"@metamask/ethjs-query>babel-runtime>core-js": true,
"@metamask/ethjs-query>babel-runtime>regenerator-runtime": true
}
},
"@metamask/ethjs-query>babel-runtime>core-js": {
"globals": {
"PromiseRejectionEvent": true,
"__e": "write",
"__g": "write",
"document.createTextNode": true,
"postMessage": true,
"setTimeout": true
}
},
"@metamask/ethjs-query>babel-runtime>regenerator-runtime": {
"globals": {
"regeneratorRuntime": "write"
}
},
"@metamask/ethjs>@metamask/ethjs-filter": {
"globals": {
"clearInterval": true,
Expand All @@ -1362,25 +1341,42 @@
},
"@metamask/ethjs>@metamask/ethjs-unit": {
"packages": {
"@metamask/ethjs>number-to-bn": true,
"@metamask/ethjs>@metamask/number-to-bn": true,
"bn.js": true
}
},
"@metamask/ethjs>@metamask/ethjs-util": {
"packages": {
"@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
"@metamask/ethjs>number-to-bn>strip-hex-prefix": true,
"@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
"browserify>buffer": true
}
},
"@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": {
"packages": {
"@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true
}
},
"@metamask/ethjs>@metamask/number-to-bn": {
"packages": {
"@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
"bn.js": true
}
},
"@metamask/ethjs>ethjs-abi": {
"packages": {
"@metamask/ethjs>ethjs-abi>number-to-bn": true,
"@metamask/ethjs>js-sha3": true,
"@metamask/ethjs>number-to-bn": true,
"bn.js": true,
"browserify>buffer": true
}
},
"@metamask/ethjs>ethjs-abi>number-to-bn": {
"packages": {
"@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
"bn.js": true
}
},
"@metamask/ethjs>js-sha3": {
"globals": {
"define": true
Expand All @@ -1389,17 +1385,6 @@
"browserify>process": true
}
},
"@metamask/ethjs>number-to-bn": {
"packages": {
"@metamask/ethjs>number-to-bn>strip-hex-prefix": true,
"bn.js": true
}
},
"@metamask/ethjs>number-to-bn>strip-hex-prefix": {
"packages": {
"@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true
}
},
"@metamask/gas-fee-controller": {
"globals": {
"clearInterval": true,
Expand Down Expand Up @@ -3426,7 +3411,8 @@
},
"eth-method-registry": {
"packages": {
"@metamask/ethjs": true
"@metamask/ethjs-contract": true,
"@metamask/ethjs-query": true
}
},
"eth-rpc-errors": {
Expand Down Expand Up @@ -3467,7 +3453,7 @@
"eth-sig-util>ethereumjs-util>ethjs-util": {
"packages": {
"@metamask/ethjs>@metamask/ethjs-util>is-hex-prefixed": true,
"@metamask/ethjs>number-to-bn>strip-hex-prefix": true,
"@metamask/ethjs>@metamask/ethjs-util>strip-hex-prefix": true,
"browserify>buffer": true
}
},
Expand Down
Loading

0 comments on commit baa70cc

Please sign in to comment.