From 56943232a0b8f31532f3052e65596d4e51968178 Mon Sep 17 00:00:00 2001 From: William O'Beirne Date: Fri, 9 Mar 2018 19:34:08 -0500 Subject: [PATCH 1/9] Roll Back enzyme-to-json Revoked Version (#1308) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4e873a7e..077c4d0a 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "empty": "0.10.1", "enzyme": "3.3.0", "enzyme-adapter-react-16": "1.1.1", - "enzyme-to-json": "3.3.2", + "enzyme-to-json": "3.3.1", "express": "4.16.2", "extract-text-webpack-plugin": "3.0.2", "favicons-webpack-plugin": "0.0.7", From 4788381641917a8cc78086abbd7d44704643a9cc Mon Sep 17 00:00:00 2001 From: James Prado Date: Sun, 11 Mar 2018 18:19:35 -0400 Subject: [PATCH 2/9] Update Account SubTab Routing / Token Scanner CSS Updates (#1276) * Redirect user to subtab after logging in * Update token balances styles * Adjust routing for readOnly wallets --- .../TokenBalances/AddCustomTokenForm.scss | 17 +++++++---------- .../TokenBalances/AddCustomTokenForm.tsx | 18 +++++++++--------- .../BalanceSidebar/TokenBalances/index.scss | 8 +++++++- .../containers/Tabs/SendTransaction/index.tsx | 10 ++++++++-- 4 files changed, 31 insertions(+), 22 deletions(-) diff --git a/common/components/BalanceSidebar/TokenBalances/AddCustomTokenForm.scss b/common/components/BalanceSidebar/TokenBalances/AddCustomTokenForm.scss index d1da9de9..9c7271f5 100644 --- a/common/components/BalanceSidebar/TokenBalances/AddCustomTokenForm.scss +++ b/common/components/BalanceSidebar/TokenBalances/AddCustomTokenForm.scss @@ -1,4 +1,4 @@ -@import "common/sass/variables"; +@import 'common/sass/variables'; .AddCustom { &-field { @@ -11,23 +11,20 @@ &-buttons { padding-top: 10px; + display: flex; + justify-content: center; + flex-wrap: wrap; &-help { + text-align: center; display: block; font-size: 13px; margin-bottom: 10px; } &-btn { - margin-right: 10px; - - &.btn-primary { - width: 120px; - } - - &.btn-default { - width: 110px; - } + padding: 0.5rem 1.5rem; + margin: 0.25rem 0.5rem; } } } diff --git a/common/components/BalanceSidebar/TokenBalances/AddCustomTokenForm.tsx b/common/components/BalanceSidebar/TokenBalances/AddCustomTokenForm.tsx index 294f12ea..afd2ac88 100644 --- a/common/components/BalanceSidebar/TokenBalances/AddCustomTokenForm.tsx +++ b/common/components/BalanceSidebar/TokenBalances/AddCustomTokenForm.tsx @@ -83,22 +83,22 @@ export default class AddCustomTokenForm extends React.PureComponent + {translate('Need help? Learn how to add custom tokens.')} +
- - {translate('Need help? Learn how to add custom tokens.')} - - +
); diff --git a/common/components/BalanceSidebar/TokenBalances/index.scss b/common/components/BalanceSidebar/TokenBalances/index.scss index 435e384f..5cfc44a8 100644 --- a/common/components/BalanceSidebar/TokenBalances/index.scss +++ b/common/components/BalanceSidebar/TokenBalances/index.scss @@ -1,4 +1,4 @@ -@import "common/sass/variables"; +@import 'common/sass/variables'; .TokenBalances { &-title { @@ -34,6 +34,12 @@ } &-buttons { + display: flex; + flex-wrap: wrap; + justify-content: center; + & > &-btn { + margin: 0.25rem 0.5rem; + } &-help { padding-top: 10px; text-align: center; diff --git a/common/containers/Tabs/SendTransaction/index.tsx b/common/containers/Tabs/SendTransaction/index.tsx index 03d395eb..521896a1 100644 --- a/common/containers/Tabs/SendTransaction/index.tsx +++ b/common/containers/Tabs/SendTransaction/index.tsx @@ -6,7 +6,7 @@ import { UnlockHeader } from 'components/ui'; import { SideBar } from './components/index'; import { getWalletInst } from 'selectors/wallet'; import { AppState } from 'reducers'; -import { RouteComponentProps, Route, Switch } from 'react-router'; +import { RouteComponentProps, Route, Switch, Redirect } from 'react-router'; import { RedirectWithQuery } from 'components/RedirectWithQuery'; import { WalletInfo, @@ -74,7 +74,13 @@ class SendTransaction extends React.Component { /> )} /> - + { + return wallet.isReadOnly ? : ; + }} + /> Date: Sun, 11 Mar 2018 17:22:38 -0500 Subject: [PATCH 3/9] fix(package): update wallet-address-validator to version 0.1.3 (#1303) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 077c4d0a..53991498 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "redux-saga": "0.16.0", "scryptsy": "2.0.0", "uuid": "3.2.1", - "wallet-address-validator": "0.1.2", + "wallet-address-validator": "0.1.3", "whatwg-fetch": "2.0.3", "zxcvbn": "4.4.2" }, From 7b7728cf9d5ed20befd9edab370a4b7de5c263e8 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Sun, 11 Mar 2018 17:23:15 -0500 Subject: [PATCH 4/9] chore(package): update copy-webpack-plugin to version 4.5.1 (#1306) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 53991498..68d2807a 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "cache-loader": "1.2.2", "check-node-version": "3.2.0", "concurrently": "3.5.1", - "copy-webpack-plugin": "4.5.0", + "copy-webpack-plugin": "4.5.1", "css-loader": "0.28.10", "electron": "1.8.3", "electron-builder": "20.2.1", From 3f6681711fd8aa5c8b80ea2b4e8a0c26494f72ee Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Sun, 11 Mar 2018 17:23:31 -0500 Subject: [PATCH 5/9] chore(package): update style-loader to version 0.20.3 (#1305) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 68d2807a..96d1d7be 100644 --- a/package.json +++ b/package.json @@ -119,7 +119,7 @@ "resolve-url-loader": "2.3.0", "rimraf": "2.6.2", "sass-loader": "6.0.7", - "style-loader": "0.20.2", + "style-loader": "0.20.3", "thread-loader": "1.1.5", "ts-jest": "22.4.1", "ts-loader": "3.3.1", From 7905b0cf6753d9de989d40cc9224da4cfb9d9b85 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Sun, 11 Mar 2018 17:24:20 -0500 Subject: [PATCH 6/9] chore(package): update less-loader to version 4.1.0 (#1304) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 96d1d7be..7394b110 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "jest": "22.1.4", "klaw-sync": "3.0.2", "less": "2.7.3", - "less-loader": "4.0.6", + "less-loader": "4.1.0", "lint-staged": "7.0.0", "minimist": "1.2.0", "node-sass": "4.7.2", From 9284fb56ebb48f663d915eefe650f8cc9fd2a4a8 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Sun, 11 Mar 2018 17:24:35 -0500 Subject: [PATCH 7/9] chore(package): update @types/react-select to version 1.2.4 (#1301) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7394b110..ca1b0e89 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,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.3", + "@types/react-select": "1.2.4", "@types/react-transition-group": "2.0.7", "@types/redux-logger": "3.0.5", "@types/uuid": "3.4.3", From 8649655019fdbdb013a65f6bc6eeaae92f040071 Mon Sep 17 00:00:00 2001 From: Daniel Ternyak Date: Sun, 11 Mar 2018 17:25:24 -0500 Subject: [PATCH 8/9] Add HackerOne to Announcement (#1218) --- common/config/data.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/config/data.tsx b/common/config/data.tsx index 6bce4436..116e7a64 100644 --- a/common/config/data.tsx +++ b/common/config/data.tsx @@ -18,8 +18,9 @@ export const ANNOUNCEMENT_TYPE = ''; export const ANNOUNCEMENT_MESSAGE = ( This is a Beta version of MyCrypto. Please submit any bug reports to our{' '} - GitHub, and join - the discussion on Discord. + GitHub and use{' '} + HackerOne for critical + vulnerabilities. Join the discussion on Discord. ); From 3d8f6788876afa160898fb4d601a0f9add8d0e30 Mon Sep 17 00:00:00 2001 From: Daniel Ternyak Date: Sun, 11 Mar 2018 18:09:31 -0500 Subject: [PATCH 9/9] chore(package): update electron-builder to version 20.4.0 (#1299) Closes #1271 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ca1b0e89..db413e97 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "copy-webpack-plugin": "4.5.1", "css-loader": "0.28.10", "electron": "1.8.3", - "electron-builder": "20.2.1", + "electron-builder": "20.4.0", "empty": "0.10.1", "enzyme": "3.3.0", "enzyme-adapter-react-16": "1.1.1",