From 86992e819874aa2d446851de0314b8084c597ec3 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]"
Date: Fri, 2 Mar 2018 11:19:04 -0600
Subject: [PATCH 01/17] chore(package): update ts-jest to version 22.4.1
(#1231)
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 380ed46b..346bb285 100644
--- a/package.json
+++ b/package.json
@@ -116,7 +116,7 @@
"sass-loader": "6.0.6",
"style-loader": "0.20.2",
"thread-loader": "1.1.5",
- "ts-jest": "22.4.0",
+ "ts-jest": "22.4.1",
"ts-loader": "3.3.1",
"tslint": "5.9.1",
"tslint-config-prettier": "1.9.0",
From 4dd0fc9785bc27b04e87f430b1584f1264395e4e Mon Sep 17 00:00:00 2001
From: HenryNguyen5
Date: Fri, 2 Mar 2018 16:57:17 -0500
Subject: [PATCH 02/17] Fix contract interact (#1233)
* reduce unintended side effects from empty units
* Fix contract interaction "to" address being empty
* Fix tsc errors
---
common/components/TXMetaDataPanel/TXMetaDataPanel.tsx | 6 ++++--
common/components/WalletDecrypt/WalletDecrypt.tsx | 5 +++--
.../components/InteractExplorer/components/Fields.tsx | 9 ++++++++-
common/sagas/transaction/meta/unitSwap.ts | 2 +-
4 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/common/components/TXMetaDataPanel/TXMetaDataPanel.tsx b/common/components/TXMetaDataPanel/TXMetaDataPanel.tsx
index 5428b31e..71f9165f 100644
--- a/common/components/TXMetaDataPanel/TXMetaDataPanel.tsx
+++ b/common/components/TXMetaDataPanel/TXMetaDataPanel.tsx
@@ -10,7 +10,8 @@ import {
getNonceRequested,
TGetNonceRequested,
reset,
- TReset
+ TReset,
+ ResetAction
} from 'actions/transaction';
import { fetchCCRatesRequested, TFetchCCRatesRequested } from 'actions/rates';
import { getNetworkConfig, getOffline } from 'selectors/config';
@@ -44,6 +45,7 @@ interface DefaultProps {
}
interface OwnProps {
+ resetIncludeExcludeProperties?: ResetAction['payload'];
initialState?: SliderStates;
disableToggle?: boolean;
advancedGasOptions?: AdvancedOptions;
@@ -69,7 +71,7 @@ class TXMetaDataPanel extends React.Component {
public componentDidMount() {
if (!this.props.offline) {
- this.props.reset();
+ this.props.reset(this.props.resetIncludeExcludeProperties);
this.props.fetchCCRates([this.props.network.unit]);
this.props.getNonceRequested();
}
diff --git a/common/components/WalletDecrypt/WalletDecrypt.tsx b/common/components/WalletDecrypt/WalletDecrypt.tsx
index c1546264..abf8c18a 100644
--- a/common/components/WalletDecrypt/WalletDecrypt.tsx
+++ b/common/components/WalletDecrypt/WalletDecrypt.tsx
@@ -17,7 +17,7 @@ import {
resetWallet,
TResetWallet
} from 'actions/wallet';
-import { reset, TReset } from 'actions/transaction';
+import { reset, TReset, ResetAction } from 'actions/transaction';
import translate from 'translations';
import {
KeystoreDecrypt,
@@ -55,6 +55,7 @@ interface OwnProps {
hidden?: boolean;
disabledWallets?: DisabledWallets;
showGenerateLink?: boolean;
+ resetIncludeExcludeProperties?: ResetAction['payload'];
}
interface DispatchProps {
@@ -430,7 +431,7 @@ export class WalletDecrypt extends Component {
// the payload to contain the unlocked wallet info.
const unlockValue = value && !isEmpty(value) ? value : payload;
this.WALLETS[selectedWalletKey].unlock(unlockValue);
- this.props.resetTransactionState();
+ this.props.resetTransactionState(this.props.resetIncludeExcludeProperties);
};
private isWalletDisabled = (walletKey: WalletName) => {
diff --git a/common/containers/Tabs/Contracts/components/Interact/components/InteractExplorer/components/Fields.tsx b/common/containers/Tabs/Contracts/components/Interact/components/InteractExplorer/components/Fields.tsx
index b3e0e920..7ff8a829 100644
--- a/common/containers/Tabs/Contracts/components/Interact/components/InteractExplorer/components/Fields.tsx
+++ b/common/containers/Tabs/Contracts/components/Interact/components/InteractExplorer/components/Fields.tsx
@@ -7,6 +7,7 @@ import { FullWalletOnly } from 'components/renderCbs';
interface OwnProps {
button: React.ReactElement;
}
+
export class Fields extends Component {
public render() {
const makeContent = () => (
@@ -17,6 +18,7 @@ export class Fields extends Component {
initialState="advanced"
disableToggle={true}
advancedGasOptions={{ dataField: false }}
+ resetIncludeExcludeProperties={{ exclude: { fields: ['to'] }, include: {} }}
/>
{this.props.button}
@@ -24,7 +26,12 @@ export class Fields extends Component {
);
- const makeDecrypt = () => ;
+ const makeDecrypt = () => (
+
+ );
return ;
}
diff --git a/common/sagas/transaction/meta/unitSwap.ts b/common/sagas/transaction/meta/unitSwap.ts
index c5c056d0..7c31226c 100644
--- a/common/sagas/transaction/meta/unitSwap.ts
+++ b/common/sagas/transaction/meta/unitSwap.ts
@@ -32,7 +32,7 @@ export function* handleSetUnitMeta({ payload: currentUnit }: SetUnitMetaAction):
const tokenToToken = !currUnit && !prevUnit;
const decimal: number = yield select(getDecimalFromUnit, currentUnit);
- if (etherToEther) {
+ if (etherToEther || previousUnit === '') {
return;
}
From 6927aa0b55031db74596e78728c61e3665d1ede7 Mon Sep 17 00:00:00 2001
From: William O'Beirne
Date: Sat, 3 Mar 2018 14:11:05 -0500
Subject: [PATCH 03/17] Prevent Scrolling From Altering Amount Field (#1234)
* Prevent scrolling to adjust number input.
* Blur instead, less annoying.
---
common/components/ui/Input.tsx | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/common/components/ui/Input.tsx b/common/components/ui/Input.tsx
index 6643287f..16895e80 100644
--- a/common/components/ui/Input.tsx
+++ b/common/components/ui/Input.tsx
@@ -9,6 +9,7 @@ class Input extends React.Component, State> {
public state: State = {
hasBlurred: false
};
+
public render() {
return (
, State> {
this.props.onBlur(e);
}
}}
+ onWheel={this.props.type === 'number' ? this.preventNumberScroll : undefined}
className={`input-group-input ${this.props.className} ${
this.state.hasBlurred ? 'has-blurred' : ''
} ${!!this.props.value && this.props.value.toString().length > 0 ? 'has-value' : ''}`}
/>
);
}
+
+ // When number inputs are scrolled on while in focus, the number changes. So we blur
+ // it if it's focused to prevent that behavior, without preventing the scroll.
+ private preventNumberScroll(ev: React.WheelEvent) {
+ if (document.activeElement === ev.currentTarget) {
+ ev.currentTarget.blur();
+ }
+ }
}
export default Input;
From a9aeacb775f5b96308a1391f39aa9d5314b6b5f1 Mon Sep 17 00:00:00 2001
From: Luit Hollander
Date: Sat, 3 Mar 2018 20:12:45 +0100
Subject: [PATCH 04/17] Fix Repo Link (#1239)
---
common/utils/consoleAdvertisement.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/utils/consoleAdvertisement.ts b/common/utils/consoleAdvertisement.ts
index 83f544e5..dd78f6a7 100644
--- a/common/utils/consoleAdvertisement.ts
+++ b/common/utils/consoleAdvertisement.ts
@@ -18,7 +18,7 @@ export default function consoleAdvertisement() {
┃ ,;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |__| | (_) | | | | | | |__| \\__ \\_| ┃
┃ ;;;;;;;;;;;; ;;;;;;;;; ;;;;;;;;;;;; \\____/ \\___/|_|_| |_| \\____/|___(_) ┃
┃ ;;;;;;;;;;;; ;;;;; ;;;;;;;;;;;, ┃
-┃ ;;;;;;;;;;;;: :;;;;;;;;;;;; https://github.com/MyCrypto/MyCrypto ┃
+┃ ;;;;;;;;;;;;: :;;;;;;;;;;;; https://github.com/MyCryptoHQ/MyCrypto ┃
┃ ;;;;;;;;;;;;;: :;;;;;;;;;;;;; ┃
┃ ;;;;;;;;;;;;;;: :;;;;;;;;;;;;;; ┃
┃ ';;;;;;;;;;;;;;;;;;;;;;;;;;;;; ┃
From 611e511b33cd14523e925e16f33a4118273346e6 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]"
Date: Sat, 3 Mar 2018 13:26:36 -0600
Subject: [PATCH 05/17] fix(package): update moment to version 2.21.0 (#1235)
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 346bb285..41ccd1c6 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
"jsonschema": "1.2.2",
"ledgerco": "1.2.1",
"lodash": "4.17.5",
- "moment": "2.20.1",
+ "moment": "2.21.0",
"normalizr": "3.2.4",
"qrcode": "1.2.0",
"qrcode.react": "0.8.0",
From 383df967a74f936b352c5e1e3dc2e88a0dbde562 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]"
Date: Sat, 3 Mar 2018 13:27:10 -0600
Subject: [PATCH 06/17] chore(package): update sass-loader to version 6.0.7
(#1236)
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 41ccd1c6..fc728d4c 100644
--- a/package.json
+++ b/package.json
@@ -113,7 +113,7 @@
"redux-test-utils": "0.2.2",
"resolve-url-loader": "2.2.1",
"rimraf": "2.6.2",
- "sass-loader": "6.0.6",
+ "sass-loader": "6.0.7",
"style-loader": "0.20.2",
"thread-loader": "1.1.5",
"ts-jest": "22.4.1",
From dd83071ec7732b88c09e3da433e92103ce2cf525 Mon Sep 17 00:00:00 2001
From: Daniel Ternyak
Date: Sat, 3 Mar 2018 13:27:27 -0600
Subject: [PATCH 07/17] chore(package): update url-loader to version 1.0.1
(#1240)
Closes #1237
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index fc728d4c..c3c921d3 100644
--- a/package.json
+++ b/package.json
@@ -124,7 +124,7 @@
"tslint-react": "3.5.1",
"types-rlp": "0.0.1",
"typescript": "2.6.2",
- "url-loader": "0.6.2",
+ "url-loader": "1.0.1",
"url-search-params-polyfill": "2.0.3",
"webpack": "3.11.0",
"webpack-dev-middleware": "2.0.6",
From b016d358190af0057dda771e8a538ca1a20923eb Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]"
Date: Sat, 3 Mar 2018 13:29:42 -0600
Subject: [PATCH 08/17] fix(package): update hard-source-webpack-plugin to
version 0.6.1 (#1232)
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index c3c921d3..9f5ed97e 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
"ethereumjs-util": "5.1.5",
"ethereumjs-wallet": "0.6.0",
"font-awesome": "4.7.0",
- "hard-source-webpack-plugin": "0.5.16",
+ "hard-source-webpack-plugin": "0.6.1",
"hdkey": "0.8.0",
"idna-uts46": "1.1.0",
"jsonschema": "1.2.2",
From e3194a649e72974e7d5335fe45899b76240d90bf Mon Sep 17 00:00:00 2001
From: William O'Beirne
Date: Mon, 5 Mar 2018 13:52:35 -0500
Subject: [PATCH 09/17] Fix Blurry Modals (#1246)
---
common/components/ui/Modal.scss | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/common/components/ui/Modal.scss b/common/components/ui/Modal.scss
index fa036cae..ea9d2d02 100644
--- a/common/components/ui/Modal.scss
+++ b/common/components/ui/Modal.scss
@@ -4,6 +4,8 @@
$m-background: #fff;
$m-window-padding-w: 20px;
$m-window-padding-h: 30px;
+$m-window-padding-w-mobile: 10px;
+$m-window-padding-h-mobile: 10px;
$m-header-height: 62px;
$m-header-padding: 1rem 2rem 0.5rem 2rem;
$m-content-padding: 1.5rem 2rem;
@@ -24,7 +26,7 @@ $m-anim-speed: 400ms;
.Modal {
position: fixed;
- top: 50%;
+ top: $m-window-padding-h;
left: 50%;
width: initial;
max-width: 95%;
@@ -33,7 +35,7 @@ $m-anim-speed: 400ms;
max-height: calc(100% - #{$m-window-padding-h * 2});
background: $m-background;
border-radius: 2px;
- transform: translate(-50%, -50%);
+ transform: translateX(-50%);
z-index: $zindex-modal;
overflow: hidden;
display: flex;
@@ -111,7 +113,10 @@ $m-anim-speed: 400ms;
// Mobile styles
@media(max-width: $screen-sm) {
- width: calc(100% - 40px) !important;
+ top: $m-window-padding-h-mobile;
+ width: calc(100% - #{$m-window-padding-w-mobile}) !important;
+ max-width: calc(100% - #{$m-window-padding-w-mobile * 2});
+ max-height: calc(100% - #{$m-window-padding-h-mobile * 2});
}
}
From 3a3681841271a11c51b728a7bf4e276a9bf96742 Mon Sep 17 00:00:00 2001
From: William O'Beirne
Date: Mon, 5 Mar 2018 13:58:53 -0500
Subject: [PATCH 10/17] Add Check TX Button to Transaction Notification (#1217)
* Reinstates v3 behavior on transaction send:
* Alert shows Check TX Status button
* Check TX page uses txHash query param
* LogOutPrompt now carries over search params and hash
* Remove console log
* Update test.
---
.../TransactionSucceeded.tsx | 31 ++++++++++++-------
common/components/LogOutPrompt.tsx | 6 ++--
.../Tabs/CheckTransaction/index.tsx | 17 ++++++++--
.../sagas/transaction/broadcast/helpers.tsx | 16 ++++++----
common/sass/styles/overrides/alerts.scss | 13 ++++++--
common/sass/styles/overrides/buttons.scss | 18 -----------
common/utils/helpers.ts | 5 +++
.../transaction/broadcast/helpers.spec.tsx | 2 +-
8 files changed, 62 insertions(+), 46 deletions(-)
diff --git a/common/components/ExtendedNotifications/TransactionSucceeded.tsx b/common/components/ExtendedNotifications/TransactionSucceeded.tsx
index ea0cb9b0..c2198890 100644
--- a/common/components/ExtendedNotifications/TransactionSucceeded.tsx
+++ b/common/components/ExtendedNotifications/TransactionSucceeded.tsx
@@ -1,26 +1,33 @@
import React from 'react';
-import { translateRaw } from 'translations';
+import { Link } from 'react-router-dom';
+import translate from 'translations';
+import { NewTabLink } from 'components/ui';
import { BlockExplorerConfig } from 'types/network';
export interface TransactionSucceededProps {
txHash: string;
- blockExplorer: BlockExplorerConfig;
+ blockExplorer?: BlockExplorerConfig;
}
const TransactionSucceeded = ({ txHash, blockExplorer }: TransactionSucceededProps) => {
- const txHashLink = blockExplorer.txUrl(txHash);
+ let verifyBtn: React.ReactElement | undefined;
+ if (blockExplorer) {
+ verifyBtn = (
+
+ Verify Transaction on {blockExplorer.name}
+
+ );
+ }
return (
-
{translateRaw('SUCCESS_3') + txHash}
-
- Verify Transaction
-
+
+ {translate('SUCCESS_3')} {txHash}
+
+ {verifyBtn}
+
+ {translate('NAV_CheckTxStatus')}
+
);
};
diff --git a/common/components/LogOutPrompt.tsx b/common/components/LogOutPrompt.tsx
index a7921b75..dadde8f1 100644
--- a/common/components/LogOutPrompt.tsx
+++ b/common/components/LogOutPrompt.tsx
@@ -62,7 +62,7 @@ class LogOutPromptClass extends React.Component {
};
private onConfirm = () => {
- const { nextLocation } = this.state;
+ const { nextLocation: next } = this.state;
this.props.resetWallet();
this.setState(
{
@@ -70,8 +70,8 @@ class LogOutPromptClass extends React.Component {
nextLocation: null
},
() => {
- if (nextLocation) {
- this.props.history.push(nextLocation.pathname);
+ if (next) {
+ this.props.history.push(`${next.pathname}${next.search}${next.hash}`);
}
}
);
diff --git a/common/containers/Tabs/CheckTransaction/index.tsx b/common/containers/Tabs/CheckTransaction/index.tsx
index a4bb4429..0fae96f0 100644
--- a/common/containers/Tabs/CheckTransaction/index.tsx
+++ b/common/containers/Tabs/CheckTransaction/index.tsx
@@ -1,15 +1,17 @@
import React from 'react';
import { connect } from 'react-redux';
+import { RouteComponentProps } from 'react-router';
import TabSection from 'containers/TabSection';
import TxHashInput from './components/TxHashInput';
import { TransactionStatus as TransactionStatusComponent } from 'components';
import { NewTabLink } from 'components/ui';
import { getNetworkConfig } from 'selectors/config';
+import { getParamFromURL } from 'utils/helpers';
import { AppState } from 'reducers';
import { NetworkConfig } from 'types/network';
import './index.scss';
-interface Props {
+interface StateProps {
network: NetworkConfig;
}
@@ -17,11 +19,20 @@ interface State {
hash: string;
}
+type Props = StateProps & RouteComponentProps<{}>;
+
class CheckTransaction extends React.Component {
public state: State = {
hash: ''
};
+ public componentDidMount() {
+ const hash = getParamFromURL(this.props.location.search, 'txHash');
+ if (hash) {
+ this.setState({ hash });
+ }
+ }
+
public render() {
const { network } = this.props;
const { hash } = this.state;
@@ -43,7 +54,7 @@ class CheckTransaction extends React.Component {
)}
-
+
{hash && (
@@ -64,6 +75,6 @@ class CheckTransaction extends React.Component {
};
}
-export default connect((state: AppState) => ({
+export default connect((state: AppState): StateProps => ({
network: getNetworkConfig(state)
}))(CheckTransaction);
diff --git a/common/sagas/transaction/broadcast/helpers.tsx b/common/sagas/transaction/broadcast/helpers.tsx
index 81e0fdf0..bacb0ae3 100644
--- a/common/sagas/transaction/broadcast/helpers.tsx
+++ b/common/sagas/transaction/broadcast/helpers.tsx
@@ -20,6 +20,7 @@ import React from 'react';
import { getNetworkConfig } from 'selectors/config';
import TransactionSucceeded from 'components/ExtendedNotifications/TransactionSucceeded';
import { computeIndexingHash } from 'libs/transaction';
+import { NetworkConfig } from 'types/network';
export const broadcastTransactionWrapper = (func: (serializedTx: string) => SagaIterator) =>
function* handleBroadcastTransaction(action: BroadcastRequestedAction) {
@@ -29,7 +30,7 @@ export const broadcastTransactionWrapper = (func: (serializedTx: string) => Saga
);
try {
- const shouldBroadcast = yield call(shouldBroadcastTransaction, indexingHash);
+ const shouldBroadcast: boolean = yield call(shouldBroadcastTransaction, indexingHash);
if (!shouldBroadcast) {
yield put(
showNotification(
@@ -46,16 +47,19 @@ export const broadcastTransactionWrapper = (func: (serializedTx: string) => Saga
});
yield put(queueAction);
const stringTx: string = yield call(bufferToHex, serializedTransaction);
- const broadcastedHash = yield call(func, stringTx); // convert to string because node / web3 doesnt support buffers
+ const broadcastedHash: string = yield call(func, stringTx); // convert to string because node / web3 doesnt support buffers
yield put(broadcastTransactionSucceeded({ indexingHash, broadcastedHash }));
- const network = yield select(getNetworkConfig);
- //TODO: make this not ugly
+ const network: NetworkConfig = yield select(getNetworkConfig);
+
yield put(
showNotification(
'success',
- ,
- 0
+ ,
+ Infinity
)
);
} catch (error) {
diff --git a/common/sass/styles/overrides/alerts.scss b/common/sass/styles/overrides/alerts.scss
index 6d3f7a39..4ce8690a 100644
--- a/common/sass/styles/overrides/alerts.scss
+++ b/common/sass/styles/overrides/alerts.scss
@@ -1,7 +1,7 @@
// Extends Bootstrap's `.alert`
-@import "common/sass/variables";
-@import "common/sass/mixins";
-@import "~bootstrap-sass/assets/stylesheets/bootstrap/alerts";
+@import 'common/sass/variables';
+@import 'common/sass/mixins';
+@import '~bootstrap-sass/assets/stylesheets/bootstrap/alerts';
.alert {
margin-bottom: 1rem;
@@ -16,6 +16,13 @@
opacity: 0.8;
}
}
+
+ // Alerts have their own button style
+ .btn {
+ @include button-variant($text-color, #FFF, darken(#FFF, 5%));
+ text-decoration: none;
+ margin-right: $space-xs;
+ }
}
// Alert icons
diff --git a/common/sass/styles/overrides/buttons.scss b/common/sass/styles/overrides/buttons.scss
index 63858628..28654b3a 100644
--- a/common/sass/styles/overrides/buttons.scss
+++ b/common/sass/styles/overrides/buttons.scss
@@ -100,24 +100,6 @@
}
// Contextual color overrides (?)
-.alert .btn-info {
- background-color: white;
- text-decoration: none;
- color: $brand-info;
- &:hover,
- &:focus,
- &.focus {
- text-decoration: none;
- opacity: 1;
- }
- &.disabled {
- background-color: white;
- text-decoration: none;
- color: $brand-info;
- opacity: 0.6;
- }
-}
-
.btn-group .btn-default {
border-bottom-width: 1px;
border-color: transparent;
diff --git a/common/utils/helpers.ts b/common/utils/helpers.ts
index ddeb5009..b6d1fe2c 100644
--- a/common/utils/helpers.ts
+++ b/common/utils/helpers.ts
@@ -1,3 +1,4 @@
+import qs from 'query-string';
import has from 'lodash/has';
export function objectContainsObjectKeys(checkingObject, containingObject) {
@@ -19,6 +20,10 @@ export function getParam(query: { [key: string]: string }, key: string) {
return query[keys[index]];
}
+export function getParamFromURL(url: string, param: string): string | undefined {
+ return qs.parse(qs.extract(url))[param];
+}
+
export function isPositiveInteger(n: number) {
return Number.isInteger(n) && n > 0;
}
diff --git a/spec/sagas/transaction/broadcast/helpers.spec.tsx b/spec/sagas/transaction/broadcast/helpers.spec.tsx
index 11eb3657..0a8845f5 100644
--- a/spec/sagas/transaction/broadcast/helpers.spec.tsx
+++ b/spec/sagas/transaction/broadcast/helpers.spec.tsx
@@ -128,7 +128,7 @@ describe('broadcastTransactionWrapper*', () => {
showNotification(
'success',
,
- 0
+ Infinity
)
)
);
From e45324e7f17d06a7812a9442b74bfe0b89bbc11c Mon Sep 17 00:00:00 2001
From: Daniel Ternyak
Date: Mon, 5 Mar 2018 12:59:09 -0600
Subject: [PATCH 11/17] fix(package): update hard-source-webpack-plugin to
version 0.6.4 (#1254)
Closes #1252
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 9f5ed97e..63083280 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
"ethereumjs-util": "5.1.5",
"ethereumjs-wallet": "0.6.0",
"font-awesome": "4.7.0",
- "hard-source-webpack-plugin": "0.6.1",
+ "hard-source-webpack-plugin": "0.6.4",
"hdkey": "0.8.0",
"idna-uts46": "1.1.0",
"jsonschema": "1.2.2",
From d0379b19a0d3dadc997f17f38e76e184c374ce43 Mon Sep 17 00:00:00 2001
From: William O'Beirne
Date: Mon, 5 Mar 2018 14:00:54 -0500
Subject: [PATCH 12/17] Fix Disclaimer Open on ESC (#1245)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Don’t listen to escape while modal is closed.
* Remove console
---
common/components/ui/Modal.tsx | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/components/ui/Modal.tsx b/common/components/ui/Modal.tsx
index dbe3ca5b..ff0e2f13 100644
--- a/common/components/ui/Modal.tsx
+++ b/common/components/ui/Modal.tsx
@@ -97,6 +97,10 @@ export default class Modal extends PureComponent {
};
private escapeListner = (ev: KeyboardEvent) => {
+ if (!this.props.isOpen) {
+ return;
+ }
+
// Don't trigger if they hit escape while on an input
if (ev.target) {
if (
From 533255094bab085547b68f7baedde507f8e6d067 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]"
Date: Mon, 5 Mar 2018 13:49:42 -0600
Subject: [PATCH 13/17] fix(package): update electron-updater to version 2.21.0
(#1251)
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 63083280..88663610 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
"bn.js": "4.11.8",
"bootstrap-sass": "3.3.7",
"classnames": "2.2.5",
- "electron-updater": "2.20.1",
+ "electron-updater": "2.21.0",
"ethereum-blockies": "git+https://github.com/MyCryptoHQ/blockies.git",
"ethereumjs-abi": "0.6.5",
"ethereumjs-tx": "1.3.3",
From 79414037829317cd3bae91261ef039d7d7cf16fb Mon Sep 17 00:00:00 2001
From: Taylor Monahan <7924827+tayvano@users.noreply.github.com>
Date: Mon, 5 Mar 2018 11:51:06 -0800
Subject: [PATCH 14/17] Copy / messaging tweaks (#1253)
* replace "don't have a wallet" with "account" for more consistency
* Update Copyright info in disclaimer model
* fix prettier issues
---
common/components/Footer/DisclaimerModal.tsx | 6 +++++-
common/components/WalletDecrypt/WalletDecrypt.tsx | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/common/components/Footer/DisclaimerModal.tsx b/common/components/Footer/DisclaimerModal.tsx
index 8ec1b62b..3c18a17a 100644
--- a/common/components/Footer/DisclaimerModal.tsx
+++ b/common/components/Footer/DisclaimerModal.tsx
@@ -41,7 +41,11 @@ const DisclaimerModal: React.SFC = ({ isOpen, handleClose }) => {
English and, because of this, the English version of our website is the official text.
- MIT License Copyright © 2015-2017 MyCrypto LLC
+ MIT License
+
+ Copyright (c) 2015-2017 MyEtherWallet LLC
+
+ Copyright (c) 2018 MyCrypto, Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy of this
diff --git a/common/components/WalletDecrypt/WalletDecrypt.tsx b/common/components/WalletDecrypt/WalletDecrypt.tsx
index abf8c18a..b94a1c67 100644
--- a/common/components/WalletDecrypt/WalletDecrypt.tsx
+++ b/common/components/WalletDecrypt/WalletDecrypt.tsx
@@ -349,7 +349,7 @@ export class WalletDecrypt extends Component {
{this.props.showGenerateLink && (
- Don’t have a wallet? Click here to get one.
+ Don’t have an account yet? Click here to get one.
)}
From 3bdf41cf591bb13fcd871058461af1658faebdc1 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]"
Date: Mon, 5 Mar 2018 13:51:45 -0600
Subject: [PATCH 15/17] chore(package): update electron-builder to version
20.2.1 (#1250)
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 88663610..374c14cd 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
"copy-webpack-plugin": "4.5.0",
"css-loader": "0.28.10",
"electron": "1.8.2",
- "electron-builder": "20.2.0",
+ "electron-builder": "20.2.1",
"empty": "0.10.1",
"enzyme": "3.3.0",
"enzyme-adapter-react-16": "1.1.1",
From 446d7043c398b4e24ae26810890810d3419b1c24 Mon Sep 17 00:00:00 2001
From: "greenkeeper[bot]"
Date: Mon, 5 Mar 2018 13:52:27 -0600
Subject: [PATCH 16/17] chore(package): update resolve-url-loader to version
2.3.0 (#1243)
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 374c14cd..967627d1 100644
--- a/package.json
+++ b/package.json
@@ -111,7 +111,7 @@
"react-test-renderer": "16.2.0",
"redux-devtools-extension": "2.13.2",
"redux-test-utils": "0.2.2",
- "resolve-url-loader": "2.2.1",
+ "resolve-url-loader": "2.3.0",
"rimraf": "2.6.2",
"sass-loader": "6.0.7",
"style-loader": "0.20.2",
From 0d4bc5bbb1e936bbfeb109b8c9aee8bbf0847490 Mon Sep 17 00:00:00 2001
From: Daniel Ternyak
Date: Mon, 5 Mar 2018 14:36:20 -0600
Subject: [PATCH 17/17] Tag Beta Release 0.5.0 (#1255)
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 967627d1..4672bb13 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "MyCrypto",
"author": "MyCryptoHQ",
- "version": "0.4.0",
+ "version": "0.5.0",
"main": "main.js",
"description": "MyCrypto web and electron app",
"repository": "https://github.com/MyCryptoHQ/MyCrypto",