-
Notifications
You must be signed in to change notification settings - Fork 5.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5893 from MetaMask/loading-network-screen
Loading network screen
- Loading branch information
Showing
15 changed files
with
341 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export { default } from './loading-network-screen.container' |
138 changes: 138 additions & 0 deletions
138
ui/app/components/loading-network-screen/loading-network-screen.component.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| import React, { PureComponent } from 'react' | ||
| import PropTypes from 'prop-types' | ||
| import Spinner from '../spinner' | ||
| import Button from '../button' | ||
|
|
||
| export default class LoadingNetworkScreen extends PureComponent { | ||
| state = { | ||
| showErrorScreen: false, | ||
| } | ||
|
|
||
| static contextTypes = { | ||
| t: PropTypes.func, | ||
| } | ||
|
|
||
| static propTypes = { | ||
| loadingMessage: PropTypes.string, | ||
| cancelTime: PropTypes.number, | ||
| provider: PropTypes.oneOfType([PropTypes.string, PropTypes.object]), | ||
| providerId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), | ||
| showNetworkDropdown: PropTypes.func, | ||
| setProviderArgs: PropTypes.array, | ||
| lastSelectedProvider: PropTypes.oneOfType([PropTypes.string, PropTypes.object]), | ||
| setProviderType: PropTypes.func, | ||
| isLoadingNetwork: PropTypes.bool, | ||
| } | ||
|
|
||
| componentDidMount = () => { | ||
| this.cancelCallTimeout = setTimeout(this.cancelCall, this.props.cancelTime || 15000) | ||
| } | ||
|
|
||
| getConnectingLabel = function (loadingMessage) { | ||
| if (loadingMessage) { | ||
| return loadingMessage | ||
| } | ||
| const { provider, providerId } = this.props | ||
| const providerName = provider.type | ||
|
|
||
| let name | ||
|
|
||
| if (providerName === 'mainnet') { | ||
| name = this.context.t('connectingToMainnet') | ||
| } else if (providerName === 'ropsten') { | ||
| name = this.context.t('connectingToRopsten') | ||
| } else if (providerName === 'kovan') { | ||
| name = this.context.t('connectingToKovan') | ||
| } else if (providerName === 'rinkeby') { | ||
| name = this.context.t('connectingToRinkeby') | ||
| } else { | ||
| name = this.context.t('connectingTo', [providerId]) | ||
| } | ||
|
|
||
| return name | ||
| } | ||
|
|
||
| renderMessage = () => { | ||
| return <span>{ this.getConnectingLabel(this.props.loadingMessage) }</span> | ||
| } | ||
|
|
||
| renderLoadingScreenContent = () => { | ||
| return <div className="loading-overlay__screen-content"> | ||
| <Spinner color="#F7C06C" /> | ||
| {this.renderMessage()} | ||
| </div> | ||
| } | ||
|
|
||
| renderErrorScreenContent = () => { | ||
| const { showNetworkDropdown, setProviderArgs, setProviderType } = this.props | ||
|
|
||
| return <div className="loading-overlay__error-screen"> | ||
| <span className="loading-overlay__emoji">😞</span> | ||
| <span>{ this.context.t('somethingWentWrong') }</span> | ||
| <div className="loading-overlay__error-buttons"> | ||
| <Button | ||
| type="default" | ||
| onClick={() => { | ||
| window.clearTimeout(this.cancelCallTimeout) | ||
| showNetworkDropdown() | ||
| }} | ||
| > | ||
| { this.context.t('switchNetworks') } | ||
| </Button> | ||
|
|
||
| <Button | ||
| type="primary" | ||
| onClick={() => { | ||
| this.setState({ showErrorScreen: false }) | ||
| setProviderType(...setProviderArgs) | ||
| window.clearTimeout(this.cancelCallTimeout) | ||
| this.cancelCallTimeout = setTimeout(this.cancelCall, this.props.cancelTime || 15000) | ||
| }} | ||
| > | ||
| { this.context.t('tryAgain') } | ||
| </Button> | ||
| </div> | ||
| </div> | ||
| } | ||
|
|
||
| cancelCall = () => { | ||
| const { isLoadingNetwork } = this.props | ||
|
|
||
| if (isLoadingNetwork) { | ||
| this.setState({ showErrorScreen: true }) | ||
| } | ||
| } | ||
|
|
||
| componentDidUpdate = (prevProps) => { | ||
| const { provider } = this.props | ||
| const { provider: prevProvider } = prevProps | ||
| if (provider.type !== prevProvider.type) { | ||
| window.clearTimeout(this.cancelCallTimeout) | ||
| this.setState({ showErrorScreen: false }) | ||
| this.cancelCallTimeout = setTimeout(this.cancelCall, this.props.cancelTime || 15000) | ||
| } | ||
| } | ||
|
|
||
| componentWillUnmount = () => { | ||
| window.clearTimeout(this.cancelCallTimeout) | ||
| } | ||
|
|
||
| render () { | ||
| const { lastSelectedProvider, setProviderType } = this.props | ||
|
|
||
| return ( | ||
| <div className="loading-overlay"> | ||
| <div | ||
| className="page-container__header-close" | ||
| onClick={() => setProviderType(lastSelectedProvider || 'ropsten')} | ||
| /> | ||
| <div className="loading-overlay__container"> | ||
| { this.state.showErrorScreen | ||
| ? this.renderErrorScreenContent() | ||
| : this.renderLoadingScreenContent() | ||
| } | ||
| </div> | ||
| </div> | ||
| ) | ||
| } | ||
| } |
41 changes: 41 additions & 0 deletions
41
ui/app/components/loading-network-screen/loading-network-screen.container.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| import { connect } from 'react-redux' | ||
| import LoadingNetworkScreen from './loading-network-screen.component' | ||
| import actions from '../../actions' | ||
| import { getNetworkIdentifier } from '../../selectors' | ||
|
|
||
| const mapStateToProps = state => { | ||
| const { | ||
| loadingMessage, | ||
| currentView, | ||
| } = state.appState | ||
| const { | ||
| provider, | ||
| lastSelectedProvider, | ||
| network, | ||
| } = state.metamask | ||
| const { rpcTarget, chainId, ticker, nickname, type } = provider | ||
|
|
||
| const setProviderArgs = type === 'rpc' | ||
| ? [rpcTarget, chainId, ticker, nickname] | ||
| : [provider.type] | ||
|
|
||
| return { | ||
| isLoadingNetwork: network === 'loading' && currentView.name !== 'config', | ||
| loadingMessage, | ||
| lastSelectedProvider, | ||
| setProviderArgs, | ||
| provider, | ||
| providerId: getNetworkIdentifier(state), | ||
| } | ||
| } | ||
|
|
||
| const mapDispatchToProps = dispatch => { | ||
| return { | ||
| setProviderType: (type) => { | ||
| dispatch(actions.setProviderType(type)) | ||
| }, | ||
| showNetworkDropdown: () => dispatch(actions.showNetworkDropdown()), | ||
| } | ||
| } | ||
|
|
||
| export default connect(mapStateToProps, mapDispatchToProps)(LoadingNetworkScreen) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export { default } from './loading-network-error.container' |
Oops, something went wrong.