From 310536afc9aa0acbb49f3e9405f8ead5505945e2 Mon Sep 17 00:00:00 2001 From: Daniel Ternyak Date: Mon, 12 Feb 2018 14:54:41 -0600 Subject: [PATCH 01/12] Tag Beta 0.2.0 (#1060) --- common/config/data.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/config/data.tsx b/common/config/data.tsx index 2adcf339..f22df0fe 100644 --- a/common/config/data.tsx +++ b/common/config/data.tsx @@ -4,7 +4,7 @@ import { getValues } from '../utils/helpers'; export const languages = require('./languages.json'); // Displays in the footer -export const VERSION = '0.1.0 (BETA)'; +export const VERSION = '0.2.0 (BETA)'; export const N_FACTOR = 8192; // Displays at the top of the site, make message empty string to remove. From 0e692f4149e3e7d38515bed13437de408d771a4a Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Mon, 12 Feb 2018 17:03:34 -0600 Subject: [PATCH 02/12] chore(package): update @types/react-select to version 1.2.1 (#1069) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c673dd44..53386185 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "@types/react-redux": "5.0.14", "@types/react-router-dom": "4.2.3", "@types/react-router-redux": "5.0.11", - "@types/react-select": "1.2.0", + "@types/react-select": "1.2.1", "@types/redux-logger": "3.0.5", "@types/uuid": "3.4.3", "@types/webpack-env": "1.13.4", From 8aabb627cc279614a96f2115f9b05bdb763f6cc8 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Mon, 12 Feb 2018 17:04:43 -0600 Subject: [PATCH 03/12] chore(package): update @types/react-router-redux to version 5.0.12 (#1068) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 53386185..79fa8ba3 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "@types/react-dom": "16.0.3", "@types/react-redux": "5.0.14", "@types/react-router-dom": "4.2.3", - "@types/react-router-redux": "5.0.11", + "@types/react-router-redux": "5.0.12", "@types/react-select": "1.2.1", "@types/redux-logger": "3.0.5", "@types/uuid": "3.4.3", From c693f1b182f082cc18dcbb85c1ed47af5628cee3 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Mon, 12 Feb 2018 17:05:20 -0600 Subject: [PATCH 04/12] chore(package): update @types/react-router-dom to version 4.2.4 (#1067) --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 79fa8ba3..4e52d664 100644 --- a/package.json +++ b/package.json @@ -63,8 +63,8 @@ "@types/react": "16.0.35", "@types/react-dom": "16.0.3", "@types/react-redux": "5.0.14", - "@types/react-router-dom": "4.2.3", - "@types/react-router-redux": "5.0.12", + "@types/react-router-dom": "4.2.4", + "@types/react-router-redux": "5.0.13", "@types/react-select": "1.2.1", "@types/redux-logger": "3.0.5", "@types/uuid": "3.4.3", From 14aca1b273314f8ba12aeb1c8f92484f60009c60 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Mon, 12 Feb 2018 17:06:00 -0600 Subject: [PATCH 05/12] chore(package): update @types/react-redux to version 5.0.15 (#1066) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4e52d664..4a3b7272 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "@types/query-string": "5.0.1", "@types/react": "16.0.35", "@types/react-dom": "16.0.3", - "@types/react-redux": "5.0.14", + "@types/react-redux": "5.0.15", "@types/react-router-dom": "4.2.4", "@types/react-router-redux": "5.0.13", "@types/react-select": "1.2.1", From 12de0eae4506194cddd6547ffc261be6f77be8f5 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Mon, 12 Feb 2018 17:06:40 -0600 Subject: [PATCH 06/12] chore(package): update @types/react-dom to version 16.0.4 (#1065) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4a3b7272..e3d9d72c 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "@types/qrcode.react": "0.6.2", "@types/query-string": "5.0.1", "@types/react": "16.0.35", - "@types/react-dom": "16.0.3", + "@types/react-dom": "16.0.4", "@types/react-redux": "5.0.15", "@types/react-router-dom": "4.2.4", "@types/react-router-redux": "5.0.13", From 592f90d889fcbc87704afc38f8bc1073309e1464 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Mon, 12 Feb 2018 17:07:17 -0600 Subject: [PATCH 07/12] chore(package): update @types/react to version 16.0.37 (#1063) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e3d9d72c..ae827d6d 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "@types/qrcode": "0.8.0", "@types/qrcode.react": "0.6.2", "@types/query-string": "5.0.1", - "@types/react": "16.0.35", + "@types/react": "16.0.37", "@types/react-dom": "16.0.4", "@types/react-redux": "5.0.15", "@types/react-router-dom": "4.2.4", From 8b5aa9569d11cba11a2ac4a9df9f85b9b703c7ca Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Mon, 12 Feb 2018 17:07:39 -0600 Subject: [PATCH 08/12] chore(package): update @types/qrcode.react to version 0.6.3 (#1062) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ae827d6d..cbb6e6b2 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "@types/jest": "22.1.2", "@types/lodash": "4.14.102", "@types/qrcode": "0.8.0", - "@types/qrcode.react": "0.6.2", + "@types/qrcode.react": "0.6.3", "@types/query-string": "5.0.1", "@types/react": "16.0.37", "@types/react-dom": "16.0.4", From 04901d048639b69e9e9fd38a22d2c007a2e12383 Mon Sep 17 00:00:00 2001 From: Daniel Ternyak Date: Mon, 12 Feb 2018 18:07:43 -0600 Subject: [PATCH 09/12] fix @types/react-router-redux version (#1072) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cbb6e6b2..a5f49543 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "@types/react-dom": "16.0.4", "@types/react-redux": "5.0.15", "@types/react-router-dom": "4.2.4", - "@types/react-router-redux": "5.0.13", + "@types/react-router-redux": "5.0.12", "@types/react-select": "1.2.1", "@types/redux-logger": "3.0.5", "@types/uuid": "3.4.3", From 23cdff177700289711de0b4e431c6d4927dcfc8f Mon Sep 17 00:00:00 2001 From: James Prado Date: Mon, 12 Feb 2018 19:15:27 -0500 Subject: [PATCH 10/12] Add Symbols to Equivalent Values (#1038) * Update styles * Add fiat symbols * chore(package): update webpack-dev-middleware to version 2.0.5 (#1036) * Fix double alert on swap timeout (#1034) * chore(package): update @types/jest to version 22.1.2 (#1037) * Update Banners / Versions to Beta (#1040) * update agreeement banner with beta nomenclature / styling * update version * remove v4 text * adjust language * more language * MyEtherWallet => MyCrypto (#1041) * MyEtherWallet => MyCrypto Note: Knowledge base links in translations are not working due to the new knowledge base. Some links link to the MyEtherWallet Chrome Extension. * Update consoleAdvertisement.ts * Update consoleAdvertisement.ts * Update en.json * Update consoleAdvertisement.ts * Update InsecureWalletWarning.tsx * Update Footer to Prod Styles (#1044) * More MEW -> MyCrypto Changes (#1043) * Replace all language instances of MYCRYPTO LLC * Fix disclaimer LLC * Fix console advert link, adjust logo and make it easier to edit. * Update coinbase URL. * Fix trezor and ledger component links and text. * Misc. cleanup. * Update unlock guide at the end of generate. * Fix onboarding translation string * Change salt hash from mew to mycrpyto. * chore(package): update webpack to version 3.11.0 (#1045) * Contributor Guidelines (#1054) * chore(package): update ts-jest to version 22.0.4 (#1053) * fix(package): update react-markdown to version 3.2.0 (#1055) * chore(package): update image-webpack-loader to version 4.1.0 (#1049) * Add selfHidingImg * Add coin & token images * Update styles & fix undefined img path * Update styles * Align all symbols to left * Use icon assets * remove selfhidingimg --- .../BalanceSidebar/EquivalentValues.scss | 28 ++++++++++- .../BalanceSidebar/EquivalentValues.tsx | 48 +++++++++++++++++-- 2 files changed, 71 insertions(+), 5 deletions(-) diff --git a/common/components/BalanceSidebar/EquivalentValues.scss b/common/components/BalanceSidebar/EquivalentValues.scss index a304ca3b..0466c8d7 100644 --- a/common/components/BalanceSidebar/EquivalentValues.scss +++ b/common/components/BalanceSidebar/EquivalentValues.scss @@ -25,15 +25,39 @@ &-values { display: flex; flex-wrap: wrap; + &-spacer { + height: 1px; + width: 100%; + margin: 0.5rem 0rem; + margin-bottom: 0.75rem; + background-color: #ececec; + background-position: center; + background-size: 1px 1px; + } &-currency { - width: 50%; + min-width: 50%; margin-bottom: $space-xs; + display: flex; + flex-wrap: nowrap; + align-items: center; + &-fiat-symbol { + height: 18px; + width: 18px; + margin-right: 0.5rem; + text-align: center; + } + &-coin-and-token { + img { + height: 18px; + width: 18px; + margin-right: 0.5rem; + } + } &-label { white-space: pre-wrap; display: inline-block; min-width: 36px; opacity: 0.54; - margin-right: 8px; } &-value { font-weight: 600; diff --git a/common/components/BalanceSidebar/EquivalentValues.tsx b/common/components/BalanceSidebar/EquivalentValues.tsx index 5af1589f..cc4b2499 100644 --- a/common/components/BalanceSidebar/EquivalentValues.tsx +++ b/common/components/BalanceSidebar/EquivalentValues.tsx @@ -12,6 +12,9 @@ import { Wei } from 'libs/units'; import { AppState } from 'reducers'; import { getNetworkConfig, getOffline } from 'selectors/config'; import { connect } from 'react-redux'; +import btcIco from 'assets/images/bitcoin.png'; +import ethIco from 'assets/images/ether.png'; +import repIco from 'assets/images/augur.png'; import { NetworkConfig } from 'types/network'; interface AllValue { @@ -116,9 +119,22 @@ class EquivalentValues extends React.Component { const isFetching = !balance || balance.isPending || !tokenBalances || Object.keys(rates).length === 0; const pairRates = this.generateValues(equivalentValues.label, equivalentValues.value); + const fiatSymbols = { + USD: '$', + EUR: '€', + GBP: '£', + CHF: ' ' + }; + const coinAndTokenSymbols = { + BTC: btcIco, + ETH: ethIco, + REP: repIco + }; - const Value = ({ rate, value }) => ( -
+ const Value = ({ className = '', rate, value, symbol = '', icon = '' }) => ( +
+ + {!!symbol && {symbol}} {rate}{' '} { ) : (
{pairRates.length ? ( - pairRates.map((equiv, i) => ) + + {pairRates.map( + (equiv, i) => + (rateSymbols.symbols.fiat as string[]).includes(equiv.rate) && ( + + ) + )} +
+ {pairRates.map( + (equiv, i) => + (rateSymbols.symbols.coinAndToken as string[]).includes(equiv.rate) && ( + + ) + )} + ) : (

Sorry, equivalent values are not supported for this unit.

)} From e529c7d394a5438b285ce0482ba5f3ba43382f3c Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Mon, 12 Feb 2018 18:54:49 -0600 Subject: [PATCH 11/12] chore(package): update @types/react-select to version 1.2.2 (#1073) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a5f49543..54d7263a 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "@types/react-redux": "5.0.15", "@types/react-router-dom": "4.2.4", "@types/react-router-redux": "5.0.12", - "@types/react-select": "1.2.1", + "@types/react-select": "1.2.2", "@types/redux-logger": "3.0.5", "@types/uuid": "3.4.3", "@types/webpack-env": "1.13.4", From a8a82c2d717f73c3b1ca8851209a8944816db1ce Mon Sep 17 00:00:00 2001 From: Daniel Ternyak Date: Mon, 12 Feb 2018 18:55:15 -0600 Subject: [PATCH 12/12] Tag Beta 0.2.1 (#1074) --- common/config/data.tsx | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/config/data.tsx b/common/config/data.tsx index f22df0fe..3d786dea 100644 --- a/common/config/data.tsx +++ b/common/config/data.tsx @@ -4,7 +4,7 @@ import { getValues } from '../utils/helpers'; export const languages = require('./languages.json'); // Displays in the footer -export const VERSION = '0.2.0 (BETA)'; +export const VERSION = '0.2.1 (BETA)'; export const N_FACTOR = 8192; // Displays at the top of the site, make message empty string to remove. diff --git a/package.json b/package.json index 54d7263a..978a968c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "MyCrypto", "author": "MyCryptoHQ", - "version": "0.1.0", + "version": "0.2.1", "main": "main.js", "description": "MyCrypto web and electron app", "repository": "https://github.com/MyCryptoHQ/MyCrypto",