m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 01:47:00 +01:00
Code

Add @metamask/logo (#9281)

Browse Source 
* Remove metamask-logo
This commit is contained in:
Erik Marks 2020-08-20 10:48:43 -07:00 committed by GitHub
parent 42f4c2e407
commit 02d318d493
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -72,6 +72,7 @@
"@metamask/eth-token-tracker": "^3.0.0", "@metamask/eth-token-tracker": "^3.0.0",
"@metamask/etherscan-link": "^1.1.0", "@metamask/etherscan-link": "^1.1.0",
"@metamask/inpage-provider": "^6.1.0", "@metamask/inpage-provider": "^6.1.0",
"@metamask/logo": "^2.5.0",
"@popperjs/core": "^2.4.0", "@popperjs/core": "^2.4.0",
"@reduxjs/toolkit": "^1.3.2", "@reduxjs/toolkit": "^1.3.2",
"@sentry/browser": "^5.11.1", "@sentry/browser": "^5.11.1",
@ -127,7 +128,6 @@
"lodash": "^4.17.19", "lodash": "^4.17.19",
"loglevel": "^1.4.1", "loglevel": "^1.4.1",
"luxon": "^1.24.1", "luxon": "^1.24.1",
"metamask-logo": "^2.4.1",
"multihashes": "^0.4.12", "multihashes": "^0.4.12",
"nanoid": "^2.1.6", "nanoid": "^2.1.6",
"nonce-tracker": "^1.0.0", "nonce-tracker": "^1.0.0",

2
test/helper.js
View File

@ -78,7 +78,7 @@ require('abortcontroller-polyfill/dist/polyfill-patch-fetch')
// localStorage // localStorage
window.localStorage = {} window.localStorage = {}
// override metamask-logo // override @metamask/logo
window.requestAnimationFrame = () => undefined window.requestAnimationFrame = () => undefined
// crypto.getRandomValues // crypto.getRandomValues

4
ui/app/components/ui/mascot/mascot.component.js
View File

@ -1,6 +1,6 @@
import PropTypes from 'prop-types' import PropTypes from 'prop-types'
import React, { createRef, Component } from 'react' import React, { createRef, Component } from 'react'
import metamaskLogo from 'metamask-logo' import MetaMaskLogo from '@metamask/logo'
import { debounce } from 'lodash' import { debounce } from 'lodash'
const directionTargetGenerator = ({ top, left, height, width }) => { const directionTargetGenerator = ({ top, left, height, width }) => {
@ -38,7 +38,7 @@ export default class Mascot extends Component {
const { width, height, followMouse } = props const { width, height, followMouse } = props
this.logo = metamaskLogo({ this.logo = MetaMaskLogo({
followMouse, followMouse,
pxNotRatio: true, pxNotRatio: true,
width, width,

16
yarn.lock
View File

@ -1809,6 +1809,14 @@
pump "^3.0.0" pump "^3.0.0"
safe-event-emitter "^1.0.1" safe-event-emitter "^1.0.1"
"@metamask/logo@^2.5.0":
version "2.5.0"
resolved "https://registry.yarnpkg.com/@metamask/logo/-/logo-2.5.0.tgz#4d35bf9e427db66c0030d81b8faa0f5162d17f7a"
integrity sha512-SBgWhcbKj0+efpFVAHf5Jh7URGMhH3Os06sgmERui+dvgXMEIBrt2aEeGRXe1aKKRSOhruazHknpdLdqyEvNjA==
dependencies:
gl-mat4 "1.1.4"
gl-vec3 "1.0.3"
"@metamask/test-dapp@^3.1.0": "@metamask/test-dapp@^3.1.0":
version "3.1.0" version "3.1.0"
resolved "https://registry.yarnpkg.com/@metamask/test-dapp/-/test-dapp-3.1.0.tgz#25560ff260bcf6611b30a26b09c915013576210c" resolved "https://registry.yarnpkg.com/@metamask/test-dapp/-/test-dapp-3.1.0.tgz#25560ff260bcf6611b30a26b09c915013576210c"
@ -18044,14 +18052,6 @@ mersenne-twister@^1.0.1, mersenne-twister@^1.1.0:
resolved "https://registry.yarnpkg.com/mersenne-twister/-/mersenne-twister-1.1.0.tgz#f916618ee43d7179efcf641bec4531eb9670978a" resolved "https://registry.yarnpkg.com/mersenne-twister/-/mersenne-twister-1.1.0.tgz#f916618ee43d7179efcf641bec4531eb9670978a"
integrity sha1-+RZhjuQ9cXnvz2Qb7EUx65Zwl4o= integrity sha1-+RZhjuQ9cXnvz2Qb7EUx65Zwl4o=
metamask-logo@^2.4.1:
version "2.4.1"
resolved "https://registry.yarnpkg.com/metamask-logo/-/metamask-logo-2.4.1.tgz#7b51456358e2d8b4576a1487640b7da304ddae87"
integrity sha512-JPMCLs/p3RTL/pLpbofV69kPn/AKJrpIdtFBZd9d+3p3f/HydT9tply2SWBr+8RjnsUaNmUoaBBZilvlPzcTDg==
dependencies:
gl-mat4 "1.1.4"
gl-vec3 "1.0.3"
methods@^1.1.1, methods@~1.1.2: methods@^1.1.1, methods@~1.1.2:
version "1.1.2" version "1.1.2"
resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"