1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 01:39:44 +01:00

Merge branch 'master' into ConfirmationStyle

This commit is contained in:
Dan Finlay 2016-07-06 22:56:07 -07:00
commit a1fdf28a7b
5 changed files with 12 additions and 9 deletions

View File

@ -4,6 +4,8 @@
- Fix formatting of ETH balance
- Fix formatting of account details.
- Use web3 minified dist for faster inject times
- Fix issue where dropdowns were not in front of icons.
## 2.5.0 2016-06-29

View File

@ -1,14 +1,13 @@
const LocalMessageDuplexStream = require('./lib/local-message-stream.js')
const PortStream = require('./lib/port-stream.js')
const ObjectMultiplex = require('./lib/obj-multiplex')
// const urlUtil = require('url')
if (shouldInjectWeb3()) {
setupInjection()
setupStreams()
}
function setupInjection(){
// inject in-page script
var scriptTag = document.createElement('script')
scriptTag.src = chrome.extension.getURL('scripts/inpage.js')
@ -16,6 +15,9 @@ function setupInjection(){
var container = document.head || document.documentElement
// append as first child
container.insertBefore(scriptTag, container.children[0])
}
function setupStreams(){
// setup communication to page and plugin
var pageStream = new LocalMessageDuplexStream({

View File

@ -1,12 +1,11 @@
/*global Web3*/
cleanContextForImports()
const Web3 = require('web3')
require('web3/dist/web3.min.js')
const LocalMessageDuplexStream = require('./lib/local-message-stream.js')
const setupDappAutoReload = require('./lib/auto-reload.js')
const MetamaskInpageProvider = require('./lib/inpage-provider.js')
restoreContextAfterImports()
// remove from window
delete window.Web3
//
// setup plugin communication

View File

@ -108,7 +108,7 @@ App.prototype.renderAppBar = function () {
background: props.isUnlocked ? 'white' : 'none',
height: '36px',
position: 'relative',
zIndex: 1,
zIndex: 2,
},
}, props.isUnlocked && [
@ -197,10 +197,10 @@ App.prototype.renderNetworkDropdown = function () {
onClickOutside: (event) => {
this.setState({ isNetworkMenuOpen: !isOpen })
},
zIndex: 1,
style: {
position: 'absolute',
left: 0,
zIndex: 0,
},
innerStyle: {
background: 'white',
@ -245,13 +245,13 @@ App.prototype.renderDropdown = function () {
return h(MenuDroppo, {
isOpen: isOpen,
zIndex: 1,
onClickOutside: (event) => {
this.setState({ isMainMenuOpen: !isOpen })
},
style: {
position: 'absolute',
right: 0,
zIndex: 0,
},
innerStyle: {
background: 'white',

View File

@ -116,7 +116,7 @@ function formatBalance (balance, decimalsToKeep) {
if (afterDecimal !== '0') {
var sigFigs = afterDecimal.match(/^0*(.{2})/) // default: grabs 2 most significant digits
if (sigFigs) { afterDecimal = sigFigs[0] }
formattedBalance = `0.${afterDecimal.slice(0, 6)}`
formattedBalance = afterDecimal.substr(0, 5) === '00000' ? '<0.00001' : `0.${afterDecimal.slice(0, 6)}`
}
} else {
formattedBalance = `${beforeDecimal}.${afterDecimal.slice(0, 2)}`