Merge pull request #535 from MetaMask/CustomRpcLoadingBug

Custom rpc loading bug
feature/default_network_editable
kumavis 8 years ago committed by GitHub
commit 4f4c78a9fc
  1. 2
      development/states.js
  2. 189
      development/states/custom-rpc.json
  3. 0
      development/states/pending-crash.json
  4. 3
      mock-dev.js
  5. 2
      ui/app/components/network.js

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -19,6 +19,7 @@ const Root = require('./ui/app/root')
const configureStore = require('./ui/app/store')
const actions = require('./ui/app/actions')
const states = require('./development/states')
const Selector = require('./development/selector')
const MetamaskController = require('./app/scripts/metamask-controller')
const extension = require('./development/mockExtension')
@ -139,6 +140,8 @@ render(
},
}, 'Reset State'),
h(Selector, { actions, selectedKey: selectedView, states, store }),
h('.mock-app-root', {
style: {
height: '500px',

@ -23,7 +23,7 @@ Network.prototype.render = function () {
if (networkNumber === 'loading') {
return h('img', {
return h('img.network-indicator', {
title: 'Attempting to connect to blockchain.',
onClick: (event) => this.props.onClick(event),
style: {

Loading…
Cancel
Save