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:
commit
3837c2ddd7
@ -26,15 +26,15 @@ class NotificationManager {
|
|||||||
// bring focus to existing chrome popup
|
// bring focus to existing chrome popup
|
||||||
extension.windows.update(popup.id, { focused: true })
|
extension.windows.update(popup.id, { focused: true })
|
||||||
} else {
|
} else {
|
||||||
|
const cb = (currentPopup) => { this._popupId = currentPopup.id }
|
||||||
// create new notification popup
|
// create new notification popup
|
||||||
extension.windows.create({
|
const creation = extension.windows.create({
|
||||||
url: 'notification.html',
|
url: 'notification.html',
|
||||||
type: 'popup',
|
type: 'popup',
|
||||||
width,
|
width,
|
||||||
height,
|
height,
|
||||||
}).then((currentPopup) => {
|
}, cb)
|
||||||
this._popupId = currentPopup.id
|
creation && creation.then && creation.then(cb)
|
||||||
})
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
14325
package-lock.json
generated
14325
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -109,12 +109,13 @@ class JsonImportSubview extends Component {
|
|||||||
.then(({ selectedAddress }) => {
|
.then(({ selectedAddress }) => {
|
||||||
if (selectedAddress) {
|
if (selectedAddress) {
|
||||||
history.push(DEFAULT_ROUTE)
|
history.push(DEFAULT_ROUTE)
|
||||||
|
displayWarning(null)
|
||||||
} else {
|
} else {
|
||||||
displayWarning('Error importing account.')
|
displayWarning('Error importing account.')
|
||||||
setSelectedAddress(firstAddress)
|
setSelectedAddress(firstAddress)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(err => displayWarning(err))
|
.catch(err => err && displayWarning(err.message || err))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -99,10 +99,11 @@ PrivateKeyImportView.prototype.createNewKeychain = function () {
|
|||||||
.then(({ selectedAddress }) => {
|
.then(({ selectedAddress }) => {
|
||||||
if (selectedAddress) {
|
if (selectedAddress) {
|
||||||
history.push(DEFAULT_ROUTE)
|
history.push(DEFAULT_ROUTE)
|
||||||
|
displayWarning(null)
|
||||||
} else {
|
} else {
|
||||||
displayWarning('Error importing account.')
|
displayWarning('Error importing account.')
|
||||||
setSelectedAddress(firstAddress)
|
setSelectedAddress(firstAddress)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(err => displayWarning(err))
|
.catch(err => err && displayWarning(err.message || err))
|
||||||
}
|
}
|
||||||
|
@ -2,6 +2,7 @@ const Component = require('react').Component
|
|||||||
const h = require('react-hyperscript')
|
const h = require('react-hyperscript')
|
||||||
const inherits = require('util').inherits
|
const inherits = require('util').inherits
|
||||||
const { conversionUtil, multiplyCurrencies } = require('../../conversion-util')
|
const { conversionUtil, multiplyCurrencies } = require('../../conversion-util')
|
||||||
|
const { removeLeadingZeroes } = require('../send_/send.utils')
|
||||||
const currencyFormatter = require('currency-formatter')
|
const currencyFormatter = require('currency-formatter')
|
||||||
const currencies = require('currency-formatter/currencies')
|
const currencies = require('currency-formatter/currencies')
|
||||||
const ethUtil = require('ethereumjs-util')
|
const ethUtil = require('ethereumjs-util')
|
||||||
@ -92,10 +93,6 @@ CurrencyDisplay.prototype.getConvertedValueToRender = function (nonFormattedValu
|
|||||||
: convertedValue
|
: convertedValue
|
||||||
}
|
}
|
||||||
|
|
||||||
function removeLeadingZeroes (str) {
|
|
||||||
return str.replace(/^0*(?=\d)/, '')
|
|
||||||
}
|
|
||||||
|
|
||||||
CurrencyDisplay.prototype.handleChange = function (newVal) {
|
CurrencyDisplay.prototype.handleChange = function (newVal) {
|
||||||
this.setState({ valueToRender: removeLeadingZeroes(newVal) })
|
this.setState({ valueToRender: removeLeadingZeroes(newVal) })
|
||||||
this.props.onChange(this.getAmount(newVal))
|
this.props.onChange(this.getAmount(newVal))
|
||||||
|
@ -33,6 +33,7 @@ module.exports = {
|
|||||||
getToAddressForGasUpdate,
|
getToAddressForGasUpdate,
|
||||||
isBalanceSufficient,
|
isBalanceSufficient,
|
||||||
isTokenBalanceSufficient,
|
isTokenBalanceSufficient,
|
||||||
|
removeLeadingZeroes,
|
||||||
}
|
}
|
||||||
|
|
||||||
function calcGasTotal (gasLimit, gasPrice) {
|
function calcGasTotal (gasLimit, gasPrice) {
|
||||||
@ -276,3 +277,7 @@ function estimateGasPriceFromRecentBlocks (recentBlocks) {
|
|||||||
function getToAddressForGasUpdate (...addresses) {
|
function getToAddressForGasUpdate (...addresses) {
|
||||||
return [...addresses, ''].find(str => str !== undefined && str !== null).toLowerCase()
|
return [...addresses, ''].find(str => str !== undefined && str !== null).toLowerCase()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function removeLeadingZeroes (str) {
|
||||||
|
return str.replace(/^0*(?=\d)/, '')
|
||||||
|
}
|
||||||
|
30
ui/app/components/send_/send.utils.test.js
Normal file
30
ui/app/components/send_/send.utils.test.js
Normal 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')
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
@ -140,7 +140,7 @@ const addCurrencies = (a, b, options = {}) => {
|
|||||||
bBase,
|
bBase,
|
||||||
...conversionOptions
|
...conversionOptions
|
||||||
} = options
|
} = options
|
||||||
const value = (new BigNumber(a, aBase)).add(b, bBase)
|
const value = (new BigNumber(a.toString(), aBase)).add(b.toString(), bBase)
|
||||||
|
|
||||||
return converter({
|
return converter({
|
||||||
value,
|
value,
|
||||||
|
22
ui/app/conversion-util.test.js
Normal file
22
ui/app/conversion-util.test.js
Normal 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)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
Loading…
Reference in New Issue
Block a user