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

fix merge conflicts

This commit is contained in:
brunobar79 2018-07-03 15:41:18 -04:00
commit 3837c2ddd7
9 changed files with 13539 additions and 864 deletions

View File

@ -26,15 +26,15 @@ class NotificationManager {
// bring focus to existing chrome popup
extension.windows.update(popup.id, { focused: true })
} else {
const cb = (currentPopup) => { this._popupId = currentPopup.id }
// create new notification popup
extension.windows.create({
const creation = extension.windows.create({
url: 'notification.html',
type: 'popup',
width,
height,
}).then((currentPopup) => {
this._popupId = currentPopup.id
})
}, cb)
creation && creation.then && creation.then(cb)
}
})
}

14325
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -109,12 +109,13 @@ class JsonImportSubview extends Component {
.then(({ selectedAddress }) => {
if (selectedAddress) {
history.push(DEFAULT_ROUTE)
displayWarning(null)
} else {
displayWarning('Error importing account.')
setSelectedAddress(firstAddress)
}
})
.catch(err => displayWarning(err))
.catch(err => err && displayWarning(err.message || err))
}
}

View File

@ -99,10 +99,11 @@ PrivateKeyImportView.prototype.createNewKeychain = function () {
.then(({ selectedAddress }) => {
if (selectedAddress) {
history.push(DEFAULT_ROUTE)
displayWarning(null)
} else {
displayWarning('Error importing account.')
setSelectedAddress(firstAddress)
}
})
.catch(err => displayWarning(err))
.catch(err => err && displayWarning(err.message || err))
}

View File

@ -2,6 +2,7 @@ const Component = require('react').Component
const h = require('react-hyperscript')
const inherits = require('util').inherits
const { conversionUtil, multiplyCurrencies } = require('../../conversion-util')
const { removeLeadingZeroes } = require('../send_/send.utils')
const currencyFormatter = require('currency-formatter')
const currencies = require('currency-formatter/currencies')
const ethUtil = require('ethereumjs-util')
@ -92,10 +93,6 @@ CurrencyDisplay.prototype.getConvertedValueToRender = function (nonFormattedValu
: convertedValue
}
function removeLeadingZeroes (str) {
return str.replace(/^0*(?=\d)/, '')
}
CurrencyDisplay.prototype.handleChange = function (newVal) {
this.setState({ valueToRender: removeLeadingZeroes(newVal) })
this.props.onChange(this.getAmount(newVal))

View File

@ -33,6 +33,7 @@ module.exports = {
getToAddressForGasUpdate,
isBalanceSufficient,
isTokenBalanceSufficient,
removeLeadingZeroes,
}
function calcGasTotal (gasLimit, gasPrice) {
@ -276,3 +277,7 @@ function estimateGasPriceFromRecentBlocks (recentBlocks) {
function getToAddressForGasUpdate (...addresses) {
return [...addresses, ''].find(str => str !== undefined && str !== null).toLowerCase()
}
function removeLeadingZeroes (str) {
return str.replace(/^0*(?=\d)/, '')
}

View File

@ -0,0 +1,30 @@
import assert from 'assert'
import { removeLeadingZeroes } from './send.utils'
describe('send utils', () => {
describe('removeLeadingZeroes()', () => {
it('should remove leading zeroes from int when user types', () => {
assert.equal(removeLeadingZeroes('0'), '0')
assert.equal(removeLeadingZeroes('1'), '1')
assert.equal(removeLeadingZeroes('00'), '0')
assert.equal(removeLeadingZeroes('01'), '1')
})
it('should remove leading zeroes from int when user copy/paste', () => {
assert.equal(removeLeadingZeroes('001'), '1')
})
it('should remove leading zeroes from float when user types', () => {
assert.equal(removeLeadingZeroes('0.'), '0.')
assert.equal(removeLeadingZeroes('0.0'), '0.0')
assert.equal(removeLeadingZeroes('0.00'), '0.00')
assert.equal(removeLeadingZeroes('0.001'), '0.001')
assert.equal(removeLeadingZeroes('0.10'), '0.10')
})
it('should remove leading zeroes from float when user copy/paste', () => {
assert.equal(removeLeadingZeroes('00.1'), '0.1')
})
})
})

View File

@ -140,7 +140,7 @@ const addCurrencies = (a, b, options = {}) => {
bBase,
...conversionOptions
} = options
const value = (new BigNumber(a, aBase)).add(b, bBase)
const value = (new BigNumber(a.toString(), aBase)).add(b.toString(), bBase)
return converter({
value,

View File

@ -0,0 +1,22 @@
import assert from 'assert'
import {addCurrencies} from './conversion-util'
describe('conversion utils', () => {
describe('addCurrencies()', () => {
it('add whole numbers', () => {
const result = addCurrencies(3, 9)
assert.equal(result.toNumber(), 12)
})
it('add decimals', () => {
const result = addCurrencies(1.3, 1.9)
assert.equal(result.toNumber(), 3.2)
})
it('add repeating decimals', () => {
const result = addCurrencies(1 / 3, 1 / 9)
assert.equal(result.toNumber(), 0.4444444444444444)
})
})
})