diff --git a/ui/app/pages/create-account/new-account.component.js b/ui/app/pages/create-account/new-account.component.js
index 8f3e89f27..6dc6419b5 100644
--- a/ui/app/pages/create-account/new-account.component.js
+++ b/ui/app/pages/create-account/new-account.component.js
@@ -58,13 +58,13 @@ export default class NewAccountCreateForm extends Component {
diff --git a/ui/app/pages/send/account-list-item/account-list-item.component.js b/ui/app/pages/send/account-list-item/account-list-item.component.js
index e6cca39b9..20ced2f09 100644
--- a/ui/app/pages/send/account-list-item/account-list-item.component.js
+++ b/ui/app/pages/send/account-list-item/account-list-item.component.js
@@ -83,7 +83,7 @@ export default class AccountListItem extends Component {
{
balanceIsCached ? * : null
@@ -94,7 +94,7 @@ export default class AccountListItem extends Component {
)
}
diff --git a/ui/app/pages/send/send-content/send-gas-row/send-gas-row.component.js b/ui/app/pages/send/send-content/send-gas-row/send-gas-row.component.js
index a770cb55e..378038f55 100644
--- a/ui/app/pages/send/send-content/send-gas-row/send-gas-row.component.js
+++ b/ui/app/pages/send/send-content/send-gas-row/send-gas-row.component.js
@@ -130,7 +130,7 @@ export default class SendGasRow extends Component {
customGasPrice={gasPrice}
customGasLimit={gasLimit}
insufficientBalance={insufficientBalance}
- customPriceIsSafe={true}
+ customPriceIsSafe
isSpeedUp={false}
/>
{ this.renderAdvancedOptionsButton() }
diff --git a/ui/app/pages/send/send-content/tests/send-content-component.test.js b/ui/app/pages/send/send-content/tests/send-content-component.test.js
index 479db9c18..203b9a6d4 100644
--- a/ui/app/pages/send/send-content/tests/send-content-component.test.js
+++ b/ui/app/pages/send/send-content/tests/send-content-component.test.js
@@ -16,7 +16,7 @@ describe('SendContent Component', function () {
beforeEach(() => {
wrapper = shallow(
,
{ context: { t: str => str + '_t' } }
)
diff --git a/ui/app/pages/send/send-footer/tests/send-footer-component.test.js b/ui/app/pages/send/send-footer/tests/send-footer-component.test.js
index b2cf4b310..e1dd0d631 100644
--- a/ui/app/pages/send/send-footer/tests/send-footer-component.test.js
+++ b/ui/app/pages/send/send-footer/tests/send-footer-component.test.js
@@ -29,7 +29,7 @@ describe('SendFooter Component', function () {
addToAddressBookIfNew={propsMethodSpies.addToAddressBookIfNew}
amount="mockAmount"
clearSend={propsMethodSpies.clearSend}
- disabled={true}
+ disabled
editingTransactionId="mockEditingTransactionId"
errors={{}}
from={ { address: 'mockAddress', balance: 'mockBalance' } }
@@ -186,7 +186,7 @@ describe('SendFooter Component', function () {
addToAddressBookIfNew={propsMethodSpies.addToAddressBookIfNew}
amount="mockAmount"
clearSend={propsMethodSpies.clearSend}
- disabled={true}
+ disabled
editingTransactionId="mockEditingTransactionId"
errors={{}}
from={ { address: 'mockAddress', balance: 'mockBalance' } }
diff --git a/ui/app/pages/send/tests/send-component.test.js b/ui/app/pages/send/tests/send-component.test.js
index 2676aa430..d5b43bbe4 100644
--- a/ui/app/pages/send/tests/send-component.test.js
+++ b/ui/app/pages/send/tests/send-component.test.js
@@ -58,7 +58,7 @@ describe('Send Component', function () {
recentBlocks={['mockBlock']}
selectedAddress="mockSelectedAddress"
selectedToken="mockSelectedToken"
- showHexData={true}
+ showHexData
tokenBalance="mockTokenBalance"
tokenContract="mockTokenContract"
updateAndSetGasLimit={propsMethodSpies.updateAndSetGasLimit}
diff --git a/ui/app/pages/send/to-autocomplete.component.js b/ui/app/pages/send/to-autocomplete.component.js
index 252fa09c4..bb27537db 100644
--- a/ui/app/pages/send/to-autocomplete.component.js
+++ b/ui/app/pages/send/to-autocomplete.component.js
@@ -61,7 +61,7 @@ export default class ToAutoComplete extends Component {
}}
icon={this.getListItemIcon(account.address, to)}
displayBalance={false}
- displayAddress={true}
+ displayAddress
/>
))}
diff --git a/ui/app/pages/settings/contact-list-tab/edit-contact/edit-contact.component.js b/ui/app/pages/settings/contact-list-tab/edit-contact/edit-contact.component.js
index 218b13cdb..9373cbe6b 100644
--- a/ui/app/pages/settings/contact-list-tab/edit-contact/edit-contact.component.js
+++ b/ui/app/pages/settings/contact-list-tab/edit-contact/edit-contact.component.js
@@ -100,7 +100,7 @@ export default class EditContact extends PureComponent {
onChange={e => this.setState({ newMemo: e.target.value })}
fullWidth
margin="dense"
- multiline={true}
+ multiline
rows={3}
classes={{
inputMultiline: 'address-book__view-contact__text-area',
diff --git a/ui/app/pages/settings/networks-tab/network-form/network-form.component.js b/ui/app/pages/settings/networks-tab/network-form/network-form.component.js
index 07919f0fb..dcdd00a90 100644
--- a/ui/app/pages/settings/networks-tab/network-form/network-form.component.js
+++ b/ui/app/pages/settings/networks-tab/network-form/network-form.component.js
@@ -24,6 +24,7 @@ export default class NetworkForm extends PureComponent {
isCurrentRpcTarget: PropTypes.bool,
blockExplorerUrl: PropTypes.string,
rpcPrefs: PropTypes.object,
+ rpcUrls: PropTypes.array,
}
state = {
@@ -211,16 +212,28 @@ export default class NetworkForm extends PureComponent {
)
}
- validateUrl = (url, stateKey) => {
- const invalidUrlErrorMsg = stateKey === 'rpcUrl' ? 'invalidRPC' : 'invalidBlockExplorerURL'
+ isValidWhenAppended = url => {
+ const appendedRpc = `http://${url}`
+ return validUrl.isWebUri(appendedRpc) && !url.match(/^https?:\/\/$/)
+ }
- if (validUrl.isWebUri(url) || (stateKey === 'blockExplorerUrl' && url === '')) {
- this.setErrorTo(stateKey, '')
+ validateBlockExplorerURL = (url, stateKey) => {
+ if (!validUrl.isWebUri(url) && url !== '') {
+ this.setErrorTo(stateKey, this.context.t(this.isValidWhenAppended(url) ? 'urlErrorMsg' : 'invalidBlockExplorerURL'))
} else {
- const appendedRpc = `http://${url}`
- const validWhenAppended = validUrl.isWebUri(appendedRpc) && !url.match(/^https?:\/\/$/)
+ this.setErrorTo(stateKey, '')
+ }
+ }
- this.setErrorTo(stateKey, this.context.t(validWhenAppended ? 'uriErrorMsg' : invalidUrlErrorMsg))
+ validateUrlRpcUrl = (url, stateKey) => {
+ const { rpcUrls } = this.props
+
+ if (!validUrl.isWebUri(url) && url !== '') {
+ this.setErrorTo(stateKey, this.context.t(this.isValidWhenAppended(url) ? 'urlErrorMsg' : 'invalidRPC'))
+ } else if (rpcUrls.includes(url)) {
+ this.setErrorTo(stateKey, this.context.t('urlExistsErrorMsg'))
+ } else {
+ this.setErrorTo(stateKey, '')
}
}
@@ -254,7 +267,7 @@ export default class NetworkForm extends PureComponent {
{this.renderFormTextField(
'rpcUrl',
'rpc-url',
- this.setStateWithValue('rpcUrl', this.validateUrl),
+ this.setStateWithValue('rpcUrl', this.validateUrlRpcUrl),
rpcUrl,
)}
{this.renderFormTextField(
@@ -274,7 +287,7 @@ export default class NetworkForm extends PureComponent {
{this.renderFormTextField(
'blockExplorerUrl',
'block-explorer-url',
- this.setStateWithValue('blockExplorerUrl', this.validateUrl),
+ this.setStateWithValue('blockExplorerUrl', this.validateBlockExplorerURL),
blockExplorerUrl,
'optionalBlockExplorerUrl',
)}
diff --git a/ui/app/pages/settings/networks-tab/networks-tab.component.js b/ui/app/pages/settings/networks-tab/networks-tab.component.js
index 40e1a902f..4ee871a58 100644
--- a/ui/app/pages/settings/networks-tab/networks-tab.component.js
+++ b/ui/app/pages/settings/networks-tab/networks-tab.component.js
@@ -20,7 +20,7 @@ export default class NetworksTab extends PureComponent {
location: PropTypes.object.isRequired,
networkIsSelected: PropTypes.bool,
networksTabIsInAddMode: PropTypes.bool,
- networksToRender: PropTypes.array.isRequired,
+ networksToRender: PropTypes.arrayOf(PropTypes.object).isRequired,
selectedNetwork: PropTypes.object,
setNetworksTabAddMode: PropTypes.func.isRequired,
setRpcTarget: PropTypes.func.isRequired,
@@ -177,6 +177,7 @@ export default class NetworksTab extends PureComponent {
editRpc,
networkDefaultedToProvider,
providerUrl,
+ networksToRender,
} = this.props
const envIsPopup = getEnvironmentType() === ENVIRONMENT_TYPE_POPUP
@@ -189,6 +190,7 @@ export default class NetworksTab extends PureComponent {
shouldRenderNetworkForm
? (
network.rpcUrl)}
setRpcTarget={setRpcTarget}
editRpc={editRpc}
networkName={label || labelKey && t(labelKey) || ''}
diff --git a/ui/app/store/actions.js b/ui/app/store/actions.js
index f76024590..2642e89e9 100644
--- a/ui/app/store/actions.js
+++ b/ui/app/store/actions.js
@@ -367,6 +367,7 @@ var actions = {
// AppStateController-related actions
SET_LAST_ACTIVE_TIME: 'SET_LAST_ACTIVE_TIME',
setLastActiveTime,
+ setMkrMigrationReminderTimestamp,
getContractMethodData,
loadingMethoDataStarted,
@@ -2755,6 +2756,16 @@ function setLastActiveTime () {
}
}
+function setMkrMigrationReminderTimestamp (timestamp) {
+ return (dispatch) => {
+ background.setMkrMigrationReminderTimestamp(timestamp, (err) => {
+ if (err) {
+ return dispatch(actions.displayWarning(err.message))
+ }
+ })
+ }
+}
+
function loadingMethoDataStarted () {
return {
type: actions.LOADING_METHOD_DATA_STARTED,