Merge branch 'master' into i#589pendingTxsIssue

8 years ago · 079c1a8972
parent 0d4bfe8038 1f0b2ca787
commit 079c1a8972
7 changed files with 29 additions and 177 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -7,6 +7,7 @@
 - On fresh install, open a new tab with the MetaMask Introduction video.
 - Block negative values from transactions.
 - Fixed a memory leak.
+- MetaMask logo now renders as super lightweight SVG, improving compatibility and performance.

 ## 2.10.2 2016-09-02

--- a/circle.yml
+++ b/circle.yml
@ -5,9 +5,3 @@ dependencies:
  pre:
    - "npm i -g testem"
    - "npm i -g mocha"
-  override:
-    - sudo apt-get install libxss1 libappindicator1 libindicator7 lsb-base
-    - curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-    - sudo dpkg -i google-chrome.deb
-    - sudo sed -i 's|HERE/chrome\"|HERE/chrome\" --disable-setuid-sandbox|g' /opt/google/chrome/google-chrome
-    - rm google-chrome.deb
--- a/development/states.js
+++ b/development/states.js
--- a/development/states/locked.json
+++ b/development/states/locked.json
@ -1,84 +1,44 @@
 {
  "metamask": {
    "isInitialized": true,
-    "isUnlocked": true,
+    "isUnlocked": false,
+    "isEthConfirmed": true,
    "currentDomain": "example.com",
    "rpcTarget": "https://rawtestrpc.metamask.io/",
-    "identities": {
-      "0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6": {
-        "name": "Wallet 1",
-        "address": "0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6",
-        "mayBeFauceting": false
-      },
-      "0x843963b837841dad3b0f5969ff271108776616df": {
-        "name": "Wallet 2",
-        "address": "0x843963b837841dad3b0f5969ff271108776616df",
-        "mayBeFauceting": false
-      },
-      "0x2cb215323857bec1c91e5db10fe87379a5cf129a": {
-        "name": "Wallet 3",
-        "address": "0x2cb215323857bec1c91e5db10fe87379a5cf129a",
-        "mayBeFauceting": false
-      },
-      "0xc5091450b7548b0dce3a76b8d325929c39e648d1": {
-        "name": "Wallet 4",
-        "address": "0xc5091450b7548b0dce3a76b8d325929c39e648d1",
-        "mayBeFauceting": false
-      }
-    },
+    "identities": {},
    "unconfTxs": {},
-    "accounts": {
-      "0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6": {
-        "balance": "0x0",
-        "nonce": "0x0",
-        "code": "0x",
-        "address": "0x5f11b68b7d41633e74c6b18d8b8d147da52aedd6"
-      },
-      "0x843963b837841dad3b0f5969ff271108776616df": {
-        "balance": "0x0",
-        "nonce": "0x0",
-        "code": "0x",
-        "address": "0x843963b837841dad3b0f5969ff271108776616df"
-      },
-      "0x2cb215323857bec1c91e5db10fe87379a5cf129a": {
-        "balance": "0x0",
-        "nonce": "0x0",
-        "code": "0x",
-        "address": "0x2cb215323857bec1c91e5db10fe87379a5cf129a"
-      },
-      "0xc5091450b7548b0dce3a76b8d325929c39e648d1": {
-        "balance": "0x0",
-        "nonce": "0x0",
-        "code": "0x",
-        "address": "0xc5091450b7548b0dce3a76b8d325929c39e648d1"
-      }
-    },
+    "currentFiat": "USD",
+    "conversionRate": 11.4379398,
+    "conversionDate": 1473358355,
+    "accounts": {},
    "transactions": [],
-    "selectedAddress": "0x843963b837841dad3b0f5969ff271108776616df",
-    "network": "2",
+    "selectedAddress": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
+    "network": "1473186153102",
+    "seedWords": null,
    "isConfirmed": true,
    "unconfMsgs": {},
    "messages": [],
+    "shapeShiftTxList": [],
    "provider": {
-      "type": "testnet"
+      "type": "rpc",
+      "rpcTarget": "http://localhost:8545"
    },
-    "selectedAccount": "0x843963b837841dad3b0f5969ff271108776616df"
+    "selectedAccount": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825"
  },
  "appState": {
    "menuOpen": false,
    "currentView": {
-      "name": "accountDetail"
+      "name": "accountDetail",
+      "detailView": null,
+      "context": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825"
    },
    "accountDetail": {
-      "subview": "transactions",
-      "accountExport": "none",
-      "privateKey": ""
+      "subview": "transactions"
    },
-    "currentDomain": "testfaucet.metamask.io",
-    "transForward": false,
+    "currentDomain": "127.0.0.1:9966",
+    "transForward": true,
    "isLoading": false,
-    "warning": null,
-    "scrollToBottom": false
+    "warning": null
  },
  "identities": {}
-}
+}
--- a/development/states/pending-tx-send-coin.json
+++ b/development/states/pending-tx-send-coin.json
@ -1,93 +1 @@
-{
-  "metamask": {
-    "currentFiat": "USD",
-    "conversionRate": 11.06608791,
-    "conversionDate": 1470421024,
-    "isInitialized": true,
-    "isInitialized": true,
-    "isUnlocked": true,
-    "isEthConfirmed": false,
-    "currentDomain": "example.com",
-    "rpcTarget": "https://rawtestrpc.metamask.io/",
-    "identities": {
-      "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
-        "name": "Wallet 1",
-        "address": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
-        "mayBeFauceting": false
-      },
-      "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb": {
-        "name": "Wallet 2",
-        "address": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
-        "mayBeFauceting": false
-      },
-      "0x2f8d4a878cfa04a6e60d46362f5644deab66572d": {
-        "name": "Wallet 3",
-        "address": "0x2f8d4a878cfa04a6e60d46362f5644deab66572d",
-        "mayBeFauceting": false
-      }
-    },
-    "unconfTxs": {
-      "1473207765149885": {
-        "id": 1473207765149885,
-        "txParams": {
-          "from": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
-          "value": "0x16345785d8a0000",
-          "to": "0xC5b8dBAc4c1d3F152cDeb400E2313F309c410aCb",
-          "origin": "MetaMask",
-          "metamaskId": 1473207765149885,
-          "metamaskNetworkId": "1473186153102"
-        },
-        "time": 1473207765149,
-        "status": "unconfirmed",
-        "containsDelegateCall": false,
-        "estimatedGas": "0x5208"
-      }
-    },
-    "accounts": {
-      "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
-        "code": "0x",
-        "balance": "0x38326dc32cf80800",
-        "nonce": "0x10000c",
-        "address": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825"
-      },
-      "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb": {
-        "code": "0x",
-        "balance": "0x15e578bd8e9c8000",
-        "nonce": "0x100000",
-        "address": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb"
-      },
-      "0x2f8d4a878cfa04a6e60d46362f5644deab66572d": {
-        "code": "0x",
-        "nonce": "0x100000",
-        "balance": "0x2386f26fc10000",
-        "address": "0x2f8d4a878cfa04a6e60d46362f5644deab66572d"
-      }
-    },
-    "transactions": [],
-    "selectedAddress": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
-    "network": "2",
-    "seedWords": null,
-    "isConfirmed": true,
-    "unconfMsgs": {},
-    "messages": [],
-    "provider": {
-      "type": "testnet"
-    },
-    "selectedAccount": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825"
-  },
-  "appState": {
-    "menuOpen": false,
-    "currentView": {
-      "name": "confTx",
-      "context": 0
-    },
-    "accountDetail": {
-      "subview": "transactions"
-    },
-    "currentDomain": "extensions",
-    "transForward": true,
-    "isLoading": false,
-    "warning": null
-  },
-  "identities": {}
-}
+{"metamask":{"isInitialized":true,"isUnlocked":true,"currentDomain":"example.com","rpcTarget":"https://rawtestrpc.metamask.io/","identities":{"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825":{"name":"Wallet 1","address":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825","mayBeFauceting":false},"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb":{"name":"Wallet 2","address":"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb","mayBeFauceting":false},"0x2f8d4a878cfa04a6e60d46362f5644deab66572d":{"name":"Wallet 3","address":"0x2f8d4a878cfa04a6e60d46362f5644deab66572d","mayBeFauceting":false}},"unconfTxs":{"1467868023090690":{"id":1467868023090690,"txParams":{"data":"0xa9059cbb0000000000000000000000008deb4d106090c3eb8f1950f727e87c4f884fb06f0000000000000000000000000000000000000000000000000000000000000064","from":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825","value":"0x16345785d8a0000","to":"0xbeb0ed3034c4155f3d16a64a5c5e7c8d4ea9e9c9","origin":"MetaMask","metamaskId":1467868023090690,"metamaskNetworkId":"2"},"time":1467868023090,"status":"unconfirmed","containsDelegateCall":false}},"accounts":{"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825":{"code":"0x","balance":"0x38326dc32cf80800","nonce":"0x10000c","address":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825"},"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb":{"code":"0x","balance":"0x15e578bd8e9c8000","nonce":"0x100000","address":"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb"},"0x2f8d4a878cfa04a6e60d46362f5644deab66572d":{"code":"0x","nonce":"0x100000","balance":"0x2386f26fc10000","address":"0x2f8d4a878cfa04a6e60d46362f5644deab66572d"}},"transactions":[],"selectedAddress":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825","network":"2","seedWords":null,"isConfirmed":true,"unconfMsgs":{},"messages":[],"provider":{"type":"testnet"},"selectedAccount":"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825"},"appState":{"menuOpen":false,"currentView":{"name":"confTx","context":0},"accountDetail":{"subview":"transactions"},"currentDomain":"extensions","transForward":true,"isLoading":false,"warning":null},"identities":{}}
--- a/package.json
+++ b/package.json
@ -51,7 +51,7 @@
    "inject-css": "^0.1.1",
    "jazzicon": "^1.1.3",
    "menu-droppo": "^1.1.0",
-    "metamask-logo": "^1.3.1",
+    "metamask-logo": "^2.0.0",
    "mississippi": "^1.2.0",
    "multiplex": "^6.7.0",
    "once": "^1.3.3",
--- a/ui/app/components/mascot.js
+++ b/ui/app/components/mascot.js
@ -14,7 +14,6 @@ function Mascot () {
    pxNotRatio: true,
    width: 200,
    height: 200,
-    staticImage: './images/icon-512.png',
  })
  if (!this.logo.webGLSupport) return
  this.refollowMouse = debounce(this.logo.setFollowMouse.bind(this.logo, true), 1000)
@ -27,28 +26,18 @@ Mascot.prototype.render = function () {
  // and we dont get that until render
  this.handleAnimationEvents()

-  return (
-
-    h('#metamask-mascot-container')
-
-  )
+  return h('#metamask-mascot-container')
 }

 Mascot.prototype.componentDidMount = function () {
  var targetDivId = 'metamask-mascot-container'
  var container = document.getElementById(targetDivId)
-  if (!this.logo.webGLSupport) {
-    var staticLogo = this.logo.staticLogo
-    staticLogo.style.marginBottom = '40px'
-    container.appendChild(staticLogo)
-  } else {
-    container.appendChild(this.logo.canvas)
-  }
+  container.appendChild(this.logo.container)
 }

 Mascot.prototype.componentWillUnmount = function () {
  if (!this.logo.webGLSupport) return
-  this.logo.canvas.remove()
+  this.logo.container.remove()
 }

 Mascot.prototype.handleAnimationEvents = function () {