Merge branch 'develop' into new-networks

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;
+      padding: 0.5rem 1.5rem;
-
+      margin: 0.25rem 0.5rem;
-      &.btn-primary {
-        width: 120px;
-      }
-
-      &.btn-default {
-        width: 110px;
-      }
     }
   }
 }

common/components/BalanceSidebar/TokenBalances/AddCustomTokenForm.tsx

@@ -83,22 +83,22 @@ export default class AddCustomTokenForm extends React.PureComponent<Props, State
           );
         })}
 
+        <HelpLink article={HELP_ARTICLE.ADDING_NEW_TOKENS} className="AddCustom-buttons-help">
+          {translate('Need help? Learn how to add custom tokens.')}
+        </HelpLink>
         <div className="AddCustom-buttons">
-          <HelpLink article={HELP_ARTICLE.ADDING_NEW_TOKENS} className="AddCustom-buttons-help">
-            {translate('Need help? Learn how to add custom tokens.')}
-          </HelpLink>
-          <button
-            className="AddCustom-buttons-btn btn btn-primary btn-sm"
-            disabled={!this.isValid()}
-          >
-            {translate('x_Save')}
-          </button>
           <button
             className="AddCustom-buttons-btn btn btn-sm btn-default"
             onClick={this.props.toggleForm}
           >
             {translate('x_Cancel')}
           </button>
+          <button
+            className="AddCustom-buttons-btn btn btn-primary btn-sm"
+            disabled={!this.isValid()}
+          >
+            {translate('x_Save')}
+          </button>
         </div>
       </form>
     );

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;

common/config/data.tsx

@@ -18,8 +18,9 @@ export const ANNOUNCEMENT_TYPE = '';
 export const ANNOUNCEMENT_MESSAGE = (
   <React.Fragment>
     This is a Beta version of MyCrypto. Please submit any bug reports to our{' '}
-    <NewTabLink href="https://github.com/MyCryptoHQ/MyCrypto/issues">GitHub</NewTabLink>, and join
+    <NewTabLink href="https://github.com/MyCryptoHQ/MyCrypto/issues">GitHub</NewTabLink> and use{' '}
-    the discussion on <NewTabLink href={discordURL}>Discord</NewTabLink>.
+    <NewTabLink href="https://hackerone.com/mycrypto">HackerOne</NewTabLink> for critical
+    vulnerabilities. Join the discussion on <NewTabLink href={discordURL}>Discord</NewTabLink>.
   </React.Fragment>
 );
 

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<Props> {
                       />
                     )}
                   />
-                  <Route exact={true} path={`${currentPath}/send`} component={Send} />
+                  <Route
+                    exact={true}
+                    path={`${currentPath}/send`}
+                    render={() => {
+                      return wallet.isReadOnly ? <Redirect to={`${currentPath}/info`} /> : <Send />;
+                    }}
+                  />
                   <Route
                     path={`${currentPath}/info`}
                     exact={true}

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"
   },
@@ -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",
@@ -83,14 +83,14 @@
     "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",
+    "electron-builder": "20.4.0",
     "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",
@@ -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",
@@ -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",