From d1c8718b27044500a89407ee0b46d51bb2a86a68 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Wed, 20 Jun 2018 14:14:24 +0200 Subject: [PATCH 1/7] Add tx in console error --- packages/light-react/src/stores/sendStore.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/light-react/src/stores/sendStore.js b/packages/light-react/src/stores/sendStore.js index abb1b4e2..9ec560f6 100644 --- a/packages/light-react/src/stores/sendStore.js +++ b/packages/light-react/src/stores/sendStore.js @@ -119,7 +119,7 @@ class SendStore { */ send = () => { if (!this.isTxValid) { - console.error('Transaction is invalid.'); + console.error('Transaction is invalid.', this.tx); return; } -- GitLab From 59262a1a173feea85c13f961cab962a8d5ea9f37 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Wed, 20 Jun 2018 14:20:57 +0200 Subject: [PATCH 2/7] Use gwei instead of estimated --- packages/light-react/src/Send/TxForm/TxForm.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/packages/light-react/src/Send/TxForm/TxForm.js b/packages/light-react/src/Send/TxForm/TxForm.js index ef3325aa..932dfb36 100644 --- a/packages/light-react/src/Send/TxForm/TxForm.js +++ b/packages/light-react/src/Send/TxForm/TxForm.js @@ -4,7 +4,6 @@ // SPDX-License-Identifier: MIT import React, { Component } from 'react'; -import { fromWei, toWei } from '@parity/api/lib/util/wei'; import { FormField, Header } from 'light-ui'; import { inject, observer } from 'mobx-react'; import { Link } from 'react-router-dom'; @@ -49,7 +48,7 @@ class Send extends Component { render () { const { - sendStore: { estimated, token, tx } + sendStore: { token, tx } } = this.props; return ( @@ -116,19 +115,14 @@ class Send extends Component { min={MIN_GAS_PRICE} onChange={this.handleChangeGasPrice} required - step={0.1} + step={0.5} type='range' value={tx.gasPrice} /> -- GitLab From 027f2ca2bef1784e4555a4c03eb35db9da4550e3 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Wed, 20 Jun 2018 14:54:18 +0200 Subject: [PATCH 3/7] Use BN for percentage --- packages/light-react/src/Health/Health.js | 4 +++- packages/light-react/src/Overlay/Overlay.js | 4 +++- packages/light-react/src/stores/healthStore.js | 8 +++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/packages/light-react/src/Health/Health.js b/packages/light-react/src/Health/Health.js index e7fd591b..0c8f403a 100644 --- a/packages/light-react/src/Health/Health.js +++ b/packages/light-react/src/Health/Health.js @@ -66,7 +66,9 @@ class Health extends Component { return 'Running...'; case STATUS.SYNCING: return `Syncing...${ - payload && payload.percentage ? ` (${payload.percentage}%)` : '' + payload && payload.percentage && payload.percentage.gt(0) + ? ` (${payload.percentage.toFixed(0)}%)` + : '' }`; default: return JSON.stringify(payload); // Just in case payload is an object diff --git a/packages/light-react/src/Overlay/Overlay.js b/packages/light-react/src/Overlay/Overlay.js index 8c29214a..3a2d935b 100644 --- a/packages/light-react/src/Overlay/Overlay.js +++ b/packages/light-react/src/Overlay/Overlay.js @@ -80,7 +80,9 @@ class Overlays extends Component { and Time" -> Uncheck and recheck "Set date and time automatically"`; case STATUS.SYNCING: case STATUS.DOWNLOADING: - return payload && payload.percentage ? `${payload.percentage}%` : ''; + return payload && payload.percentage && payload.percentage.gt(0) + ? `${payload.percentage.toFixed(0)}%` + : ''; case STATUS.NOINTERNET: return 'Please check that you are connected to the internet'; default: diff --git a/packages/light-react/src/stores/healthStore.js b/packages/light-react/src/stores/healthStore.js index 77fb338b..2a26bf48 100644 --- a/packages/light-react/src/stores/healthStore.js +++ b/packages/light-react/src/stores/healthStore.js @@ -69,9 +69,11 @@ class HealthStore { // Check if we're syncing if (this.syncing) { const { currentBlock, highestBlock, startingBlock } = this.syncing; - const percentage = Math.round( - ((currentBlock - startingBlock) * 100) / (highestBlock - startingBlock) - ); + const percentage = currentBlock + .minus(startingBlock) + .mul(100) + .div(highestBlock.minus(startingBlock)); + return { status: STATUS.SYNCING, payload: { currentBlock, highestBlock, percentage, startingBlock } -- GitLab From 790b91e8a0025bdd9d53fa36feb7cc879ecad776 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Wed, 20 Jun 2018 15:13:50 +0200 Subject: [PATCH 4/7] Show placeholder when null --- packages/light-ui/src/TokenCard/TokenCard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/light-ui/src/TokenCard/TokenCard.js b/packages/light-ui/src/TokenCard/TokenCard.js index efc7fb9a..61373544 100644 --- a/packages/light-ui/src/TokenCard/TokenCard.js +++ b/packages/light-ui/src/TokenCard/TokenCard.js @@ -25,7 +25,7 @@ const TokenCard = ({ balance, children, decimals, token, ...otherProps }) => (
{Number.isFinite(balance) ? ( {balance.toFixed(decimals)} - ) : balance === null ? null : ( + ) : ( )} {token.symbol} -- GitLab From d5532e43e58dbf6fdb18d8d179c9b53d18efa531 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Wed, 20 Jun 2018 15:23:22 +0200 Subject: [PATCH 5/7] Fix bug gavcoin not received (fix #64) --- packages/light-react/src/Settings/Settings.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/light-react/src/Settings/Settings.js b/packages/light-react/src/Settings/Settings.js index fc7375df..b4389e35 100644 --- a/packages/light-react/src/Settings/Settings.js +++ b/packages/light-react/src/Settings/Settings.js @@ -15,7 +15,7 @@ import Health from '../Health'; import NewTokenItem from './NewTokenItem'; @light({ - chainName: chainName$ + chainName: () => chainName$({ withoutLoading: true }) }) @inject('tokensStore') @observer @@ -73,7 +73,8 @@ class Settings extends Component { try { db = await import(`../assets/tokens/${this.props.chainName}.json`); } catch (e) { - db = await import(`../assets/tokens/foundation.json`); + this.setState({ db: [], dbMap: {} }); + return; } // We create a address=>token mapping here -- GitLab From 2af6200ad1537bd2b706c084de619d7c7a7d73f8 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Wed, 20 Jun 2018 15:35:00 +0200 Subject: [PATCH 6/7] Fix onboarding --- packages/light-react/src/App/App.js | 7 ++----- packages/light-react/src/Onboarding/Onboarding.js | 5 +++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/light-react/src/App/App.js b/packages/light-react/src/App/App.js index 5715372c..e9c33fcd 100644 --- a/packages/light-react/src/App/App.js +++ b/packages/light-react/src/App/App.js @@ -65,11 +65,8 @@ class App extends Component { {/* We redirect to Onboarding if necessary, or by default to our homepage which is Tokens */} - + + {isOnboarding && } diff --git a/packages/light-react/src/Onboarding/Onboarding.js b/packages/light-react/src/Onboarding/Onboarding.js index 40b8d2cc..b5f74c8a 100644 --- a/packages/light-react/src/Onboarding/Onboarding.js +++ b/packages/light-react/src/Onboarding/Onboarding.js @@ -13,8 +13,9 @@ import Health from '../Health'; @observer class Onboarding extends Component { handleFirstRun = () => { - // Not first run anymore after clicking Start + // Not first run anymore after clicking Accept this.props.onboardingStore.setIsFirstRun(false); + this.props.history.push('/'); }; render () { @@ -26,7 +27,7 @@ class Onboarding extends Component { This is the onboarding page.
{hasAccounts ? ( - Start + Accept terms of use ) : ( Create account -- GitLab From a5f7e168b914e005d893a070a4d9635e8d349889 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Wed, 20 Jun 2018 15:42:51 +0200 Subject: [PATCH 7/7] Don't show placeholder for adding token --- .../src/Settings/NewTokenItem/NewTokenItem.js | 2 +- packages/light-ui/src/TokenCard/TokenCard.js | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/packages/light-react/src/Settings/NewTokenItem/NewTokenItem.js b/packages/light-react/src/Settings/NewTokenItem/NewTokenItem.js index 562c0533..0e0f431f 100644 --- a/packages/light-react/src/Settings/NewTokenItem/NewTokenItem.js +++ b/packages/light-react/src/Settings/NewTokenItem/NewTokenItem.js @@ -32,7 +32,7 @@ class NewTokenItem extends Component { return (
  • - +
    {tokens[token.address] ? (