m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 18:00:18 +01:00
Code

Merge pull request #535 from MetaMask/CustomRpcLoadingBug

Browse Source 
Custom rpc loading bug
This commit is contained in:
kumavis 2016-08-11 20:56:11 -07:00 committed by GitHub
commit 4f4c78a9fc
5 changed files with 194 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
development/states.js
View File

File diff suppressed because one or more lines are too long

189
development/states/custom-rpc.json Normal file
View File

File diff suppressed because one or more lines are too long

0
development/states/pending_crash.json → development/states/pending-crash.json
View File

3
mock-dev.js
View File

@ -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',

2
ui/app/components/network.js
View File

@ -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: {