Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Use accountsInfo instead of eth_accounts for first check #3618

Merged
merged 1 commit into from
Nov 25, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 6 additions & 33 deletions js/src/views/Application/application.js
Original file line number Diff line number Diff line change
@@ -17,6 +17,7 @@
import React, { Component, PropTypes } from 'react';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import { observer } from 'mobx-react';

import Connection from '../Connection';
import ParityBar from '../ParityBar';
@@ -25,13 +26,14 @@ import Container from './Container';
import DappContainer from './DappContainer';
import FrameError from './FrameError';
import Status from './Status';
import Store from './store';
import TabBar from './TabBar';

import styles from './application.css';

const inFrame = window.parent !== window && window.parent.frames.length !== 0;
const showFirstRun = window.localStorage.getItem('showFirstRun') === '1';

@observer
class Application extends Component {
static contextTypes = {
api: PropTypes.object.isRequired,
@@ -46,13 +48,7 @@ class Application extends Component {
blockNumber: PropTypes.object
}

state = {
showFirstRun: false
}

componentWillMount () {
this.checkAccounts();
}
store = new Store(this.context.api);

render () {
const [root] = (window.location.hash || '').replace('#/', '').split('/');
@@ -75,12 +71,11 @@ class Application extends Component {

renderApp () {
const { children, pending, netChain, isTest, blockNumber } = this.props;
const { showFirstRun } = this.state;

return (
<Container
showFirstRun={ showFirstRun }
onCloseFirstRun={ this.onCloseFirstRun }>
showFirstRun={ this.store.firstrunVisible }
onCloseFirstRun={ this.store.closeFirstrun }>
<TabBar
netChain={ netChain }
isTest={ isTest }
@@ -100,28 +95,6 @@ class Application extends Component {
</DappContainer>
);
}

checkAccounts () {
const { api } = this.context;

api.eth
.accounts()
.then((accounts) => {
this.setState({
showFirstRun: showFirstRun || accounts.length === 0
});
})
.catch((error) => {
console.error('checkAccounts', error);
});
}

onCloseFirstRun = () => {
window.localStorage.setItem('showFirstRun', '0');
this.setState({
showFirstRun: false
});
}
}

function mapStateToProps (state) {
51 changes: 51 additions & 0 deletions js/src/views/Application/store.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
// Copyright 2015, 2016 Ethcore (UK) Ltd.
// This file is part of Parity.

// Parity is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.

// Parity is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.

// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.

import { action, observable } from 'mobx';

const showFirstRun = window.localStorage.getItem('showFirstRun') !== '0';

export default class Store {
@observable firstrunVisible = showFirstRun;

constructor (api) {
this._api = api;

this._checkAccounts();
}

@action closeFirstrun = () => {
this.toggleFirstrun(false);
}

@action toggleFirstrun = (visible = false) => {
this.firstrunVisible = visible;
window.localStorage.setItem('showFirstRun', visible ? '1' : '0');
}

_checkAccounts () {
this._api.parity
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need to make this call each time the app if started ? I guess if showFirstRun is set to 0 in LS, we shouldn't need to display this modal even if I deleted all my accounts.
Plus, if this.firstrunVisisble is true, this call is useless.
Lastly, can't we tweak the window to skip the account creation if the user already have some created accounts ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We actually have the above actually logged as an enhancement, https://github.com/ethcore/parity/issues/3583. (Won't get in with 1.5 though)

Didn't try to re-invent the world, just tried to take what we have and change the call - already did more than needed with the move to a store to clean up a little bit. (With the eth_account changes it will show up each and every time, so this is needed before that change lands)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay fair.

.accountsInfo()
.then((info) => {
const accounts = Object.keys(info).filter((address) => info[address].uuid);

this.toggleFirstrun(this.firstrunVisible || !accounts || !accounts.length);
})
.catch((error) => {
console.error('checkAccounts', error);
});
}
}