Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix token USD price calculation #5965

Closed
wants to merge 33 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
b6efd80
fix token USD price calculation
pavel-lens Dec 24, 2018
96ba1ee
remove unnecessary import of multiplyCurrencies
pavel-lens Dec 24, 2018
701bc1c
Fix etherscan links on notifications
Dec 28, 2018
58b0a4c
Dont use sudo to install truffle
Dec 31, 2018
3a75571
--unsafe-perm ?
Jan 2, 2019
d504c07
Use sudo consistently
Jan 2, 2019
3112d5b
no globals
Jan 2, 2019
c349bbd
remove --unsafe-perm
Jan 2, 2019
e43f5d3
Merge pull request #5980 from MetaMask/fix-drizzle-tests
tmashuang Jan 2, 2019
d2b0781
Merge branch 'develop' of github.com:MetaMask/metamask-extension into…
brunobar79 Jan 2, 2019
13f8b06
Merge pull request #5978 from MetaMask/fix-etherscan-link-notifications
Jan 2, 2019
c49d975
fix extension link
brunobar79 Jan 3, 2019
990bfc6
Merge pull request #5986 from MetaMask/fix-etherscan-again
tmashuang Jan 3, 2019
da7208c
Version 5.3.0 RC1
danfinlay Jan 3, 2019
9de3272
fix typo in phishing.html title
smiled0g Jan 3, 2019
0b4469b
Add scrolling button to account list
alextsg Dec 20, 2018
0b3f117
Merge pull request #5989 from smiled0g/develop
tmashuang Jan 3, 2019
9b0b2f3
Merge pull request #5992 from MetaMask/i5140-accounts
tmashuang Jan 3, 2019
cdb202a
Merge pull request #5987 from MetaMask/Version-5.3.0
tmashuang Jan 3, 2019
866b9af
Fix Component#componentDidUpdate usage (#5977)
Jan 3, 2019
089fd5f
Wrong french translation
Wathis Dec 27, 2018
cb63e8e
Merge pull request #5970 from Wathis/develop
Bunjin Jan 4, 2019
dd6d323
Fix ERC20 token value decoding (#5995)
Jan 4, 2019
35fbddc
Revert "remove error flags from drizzle setup"
whymarrh Jan 4, 2019
4d4d4ca
Clean up drizzle test runner script
whymarrh Jan 4, 2019
4e0d482
Merge pull request #5997 from whymarrh/drizzle-script
tmashuang Jan 4, 2019
58f55ee
Refine app description
danfinlay Jan 5, 2019
cef4cae
Merge pull request #5999 from MetaMask/app-description
tmashuang Jan 5, 2019
f6ed45f
fix token USD price calculation
pavel-lens Dec 24, 2018
7e7cf8a
remove unnecessary import of multiplyCurrencies
pavel-lens Dec 24, 2018
13dd2f1
Merge branch 'fix/5960-token-usd-price' of https://github.com/svitekp…
pavel-lens Jan 9, 2019
2ab5815
remove unused props
pavel-lens Jan 9, 2019
d8bb3eb
update token-cell.spec.js
pavel-lens Jan 9, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@

## Current Develop Branch

## 5.3.0 Wed Jan 02 2019

- [#5978](https://github.com/MetaMask/metamask-extension/pull/5978): Fix etherscan links on notifications
- [#5980](https://github.com/MetaMask/metamask-extension/pull/5980): Fix drizzle tests
- [#5922](https://github.com/MetaMask/metamask-extension/pull/5922): Prevent users from changing the From field in the send screen
- [#5932](https://github.com/MetaMask/metamask-extension/pull/5932): Fix displayed time and date in the activity log. Remove vreme library, add luxon library.
- [#5924](https://github.com/MetaMask/metamask-extension/pull/5924): transactions - throw an error if a transaction is generated while the network is loading
- [#5893](https://github.com/MetaMask/metamask-extension/pull/5893): Add loading network screen

## 5.2.2 Wed Dec 12 2018

- [#5925](https://github.com/MetaMask/metamask-extension/pull/5925): Fix speed up button not showing for transactions with the lowest nonce
Expand Down
2 changes: 1 addition & 1 deletion app/_locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
"message": "Amount + TX Fee"
},
"appDescription": {
"message": "Ethereum Browser Extension",
"message": "An Ethereum Wallet in your Browser",
"description": "The description of the application"
},
"appName": {
Expand Down
12 changes: 6 additions & 6 deletions app/_locales/fr/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -204,22 +204,22 @@
"message": "Connecter"
},
"connecting": {
"message": "Connection..."
"message": "Connexion..."
},
"connectingToKovan": {
"message": "Connection au réseau de test Kovan"
"message": "Connexion au réseau de test Kovan"
},
"connectingToMainnet": {
"message": "Connection au réseau principal Ethereum"
"message": "Connexion au réseau principal Ethereum"
},
"connectingToRopsten": {
"message": "Connection au réseau de test Ropsten"
"message": "Connexion au réseau de test Ropsten"
},
"connectingToRinkeby": {
"message": "Connection au réseau de test Rinkeby"
"message": "Connexion au réseau de test Rinkeby"
},
"connectingToUnknown": {
"message": "Connection à un réseau inconnu"
"message": "Connexion à un réseau inconnu"
},
"connectToLedger": {
"message": "Connecter un Ledger"
Expand Down
4 changes: 4 additions & 0 deletions app/images/icons/down-arrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "__MSG_appName__",
"short_name": "__MSG_appName__",
"version": "5.2.2",
"version": "5.3.0",
"manifest_version": 2,
"author": "https://metamask.io",
"description": "__MSG_appDescription__",
Expand Down
2 changes: 1 addition & 1 deletion app/phishing.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<html>

<head>
<title>Ethereum Phishing Detection - MetMask</title>
<title>Ethereum Phishing Detection - MetaMask</title>

<style>
body {
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/platforms/extension.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class ExtensionPlatform {

_viewOnEtherScan (txId) {
if (txId.startsWith('http://')) {
global.metamaskController.platform.openWindow({ url: txId })
extension.tabs.create({ url: txId })
}
}
}
Expand Down
33 changes: 24 additions & 9 deletions test/e2e/beta/run-drizzle.sh
Original file line number Diff line number Diff line change
@@ -1,16 +1,31 @@
#!/usr/bin/env bash

export PATH="$PATH:./node_modules/.bin"
set -e
set -u
set -o pipefail

npm run ganache:start -- -b 2 >> /dev/null 2>&1 &
npm_run_ganache_start_pid=$!
sleep 5
cd test/e2e/beta/
rm -rf drizzle-test
mkdir drizzle-test && cd drizzle-test
sudo npm install -g truffle
truffle unbox drizzle

pushd "$(mktemp -d)"
npm install --no-package-lock truffle
truffle="$(npm bin)/truffle"
$truffle unbox drizzle
echo "Deploying contracts for Drizzle test..."
truffle compile && truffle migrate
$truffle compile
$truffle migrate

BROWSER=none npm start >> /dev/null 2>&1 &
cd ../../../../
mocha test/e2e/beta/drizzle.spec
npm_start_pid=$!

popd
if ! mocha test/e2e/beta/drizzle.spec
then
test_status=1
fi

! kill -15 $npm_run_ganache_start_pid
! kill -15 $npm_start_pid
! wait $npm_run_ganache_start_pid $npm_start_pid
exit ${test_status:-}
3 changes: 1 addition & 2 deletions test/unit/ui/app/components/token-cell.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ describe('Token Cell', () => {
contractExchangeRates: {
'0xAnotherToken': 0.015,
},
conversionRate: 7.00,
},
appState: {
sidebar: {
Expand Down Expand Up @@ -63,7 +62,7 @@ describe('Token Cell', () => {
})

it('renders converted fiat amount', () => {
assert.equal(wrapper.find('.token-list-item__fiat-amount').text(), '0.52 USD')
assert.equal(wrapper.find('.token-list-item__fiat-amount').text(), '0.07 USD')
})

})
2 changes: 1 addition & 1 deletion ui/app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const NoticeScreen = require('./components/pages/notice')
const Loading = require('./components/loading-screen')
const LoadingNetwork = require('./components/loading-network-screen').default
const NetworkDropdown = require('./components/dropdowns/network-dropdown')
const AccountMenu = require('./components/account-menu')
import AccountMenu from './components/account-menu'

// Global Modals
const Modal = require('./components/modals/index').Modal
Expand Down
Loading