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

fix merge conflicts

Browse Source
This commit is contained in:
brunobar79 2018-08-08 15:40:04 -04:00
commit 656afeefad
4 changed files with 33271 additions and 33180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.npmrc
View File

@ -1 +0,0 @@
engine-strict=true

66434
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

6
package.json
View File

@ -74,7 +74,7 @@
] ]
}, },
"dependencies": { "dependencies": {
"@material-ui/core": "^1.0.0", "@material-ui/core": "1.0.0",
"@zxing/library": "^0.7.0", "@zxing/library": "^0.7.0",
"abi-decoder": "^1.0.9", "abi-decoder": "^1.0.9",
"asmcrypto.js": "0.22.0", "asmcrypto.js": "0.22.0",
@ -107,7 +107,7 @@
"eth-bin-to-ops": "^1.0.1", "eth-bin-to-ops": "^1.0.1",
"eth-contract-metadata": "github:MetaMask/eth-contract-metadata#master", "eth-contract-metadata": "github:MetaMask/eth-contract-metadata#master",
"eth-ens-namehash": "^2.0.8", "eth-ens-namehash": "^2.0.8",
"eth-hd-keyring": "^2.0.0", "eth-hd-keyring": "^1.2.2",
"eth-json-rpc-filters": "^1.2.6", "eth-json-rpc-filters": "^1.2.6",
"eth-json-rpc-infura": "^3.0.0", "eth-json-rpc-infura": "^3.0.0",
"eth-method-registry": "^1.0.0", "eth-method-registry": "^1.0.0",
@ -247,7 +247,7 @@
"eslint-plugin-mocha": "^5.0.0", "eslint-plugin-mocha": "^5.0.0",
"eslint-plugin-react": "^7.4.0", "eslint-plugin-react": "^7.4.0",
"eth-json-rpc-middleware": "^1.6.0", "eth-json-rpc-middleware": "^1.6.0",
"eth-keyring-controller": "^4.0.0", "eth-keyring-controller": "^3.3.1",
"file-loader": "^1.1.11", "file-loader": "^1.1.11",
"fs-promise": "^2.0.3", "fs-promise": "^2.0.3",
"ganache-cli": "^6.1.0", "ganache-cli": "^6.1.0",

10
ui/app/selectors/confirm-transaction.js
View File

@ -147,14 +147,20 @@ export const tokenAmountAndToAddressSelector = createSelector(
export const approveTokenAmountAndToAddressSelector = createSelector( export const approveTokenAmountAndToAddressSelector = createSelector(
tokenDataParamsSelector, tokenDataParamsSelector,
params => { tokenDecimalsSelector,
(params, tokenDecimals) => {
let toAddress = '' let toAddress = ''
let tokenAmount = 0 let tokenAmount = 0
if (params && params.length) { if (params && params.length) {
toAddress = params.find(param => param.name === TOKEN_PARAM_SPENDER).value toAddress = params.find(param => param.name === TOKEN_PARAM_SPENDER).value
const value = Number(params.find(param => param.name === TOKEN_PARAM_VALUE).value) const value = Number(params.find(param => param.name === TOKEN_PARAM_VALUE).value)
tokenAmount = roundExponential(value)
if (tokenDecimals) {
tokenAmount = calcTokenAmount(value, tokenDecimals)
}
tokenAmount = roundExponential(tokenAmount)
} }
return { return {