diff options
author | Dan <danjm.com@gmail.com> | 2018-05-24 02:33:15 +0800 |
---|---|---|
committer | Dan <danjm.com@gmail.com> | 2018-05-24 02:33:15 +0800 |
commit | 440905125d77d1d5d72d1aceac2940925a8ac38f (patch) | |
tree | d5418384983f9de8092d2dfdd1ddddec2ffd555e /ui/app/components/pages/unlock-page | |
parent | 3dec7cb52443b24d6a24f75434ee41a54f4cfd0b (diff) | |
parent | ed01c6c8264a860cdc4248991839954bdf22e2ef (diff) | |
download | tangerine-wallet-browser-440905125d77d1d5d72d1aceac2940925a8ac38f.tar.gz tangerine-wallet-browser-440905125d77d1d5d72d1aceac2940925a8ac38f.tar.zst tangerine-wallet-browser-440905125d77d1d5d72d1aceac2940925a8ac38f.zip |
Merge branch 'develop' into i3725-refactor-send-component-
Diffstat (limited to 'ui/app/components/pages/unlock-page')
-rw-r--r-- | ui/app/components/pages/unlock-page/index.scss (renamed from ui/app/components/pages/unlock-page/unlock-page.scss) | 0 | ||||
-rw-r--r-- | ui/app/components/pages/unlock-page/unlock-page.component.js | 4 | ||||
-rw-r--r-- | ui/app/components/pages/unlock-page/unlock-page.container.js | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/ui/app/components/pages/unlock-page/unlock-page.scss b/ui/app/components/pages/unlock-page/index.scss index 3d44bd037..3d44bd037 100644 --- a/ui/app/components/pages/unlock-page/unlock-page.scss +++ b/ui/app/components/pages/unlock-page/index.scss diff --git a/ui/app/components/pages/unlock-page/unlock-page.component.js b/ui/app/components/pages/unlock-page/unlock-page.component.js index d5e2a3224..a2f009d8f 100644 --- a/ui/app/components/pages/unlock-page/unlock-page.component.js +++ b/ui/app/components/pages/unlock-page/unlock-page.component.js @@ -1,6 +1,6 @@ import React, { Component } from 'react' import PropTypes from 'prop-types' -import Button from 'material-ui/Button' +import Button from '@material-ui/core/Button' import TextField from '../../text-field' const { ENVIRONMENT_TYPE_POPUP } = require('../../../../../app/scripts/lib/enums') @@ -129,6 +129,7 @@ class UnlockPage extends Component { error={error} autoFocus autoComplete="current-password" + material fullWidth /> </form> @@ -175,7 +176,6 @@ UnlockPage.propTypes = { isUnlocked: PropTypes.bool, t: PropTypes.func, useOldInterface: PropTypes.func, - setNetworkEndpoints: PropTypes.func, } export default UnlockPage diff --git a/ui/app/components/pages/unlock-page/unlock-page.container.js b/ui/app/components/pages/unlock-page/unlock-page.container.js index 9788a18ea..18fed9b2e 100644 --- a/ui/app/components/pages/unlock-page/unlock-page.container.js +++ b/ui/app/components/pages/unlock-page/unlock-page.container.js @@ -6,7 +6,6 @@ const { tryUnlockMetamask, forgotPassword, markPasswordForgotten, - setNetworkEndpoints, } = require('../../../actions') import UnlockPage from './unlock-page.component' @@ -23,7 +22,6 @@ const mapDispatchToProps = dispatch => { forgotPassword: () => dispatch(forgotPassword()), tryUnlockMetamask: password => dispatch(tryUnlockMetamask(password)), markPasswordForgotten: () => dispatch(markPasswordForgotten()), - setNetworkEndpoints: type => dispatch(setNetworkEndpoints(type)), } } |